From f03679805e843674736dd84ae165f96b2d6983e5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 5 Nov 2011 17:06:41 -0700 Subject: [PATCH] update to jquery 1.7 + add toggle method to twipsy/popover --- bootstrap.css | 2 +- docs/index.html | 2 +- docs/javascript.html | 2 +- js/bootstrap-twipsy.js | 9 +++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index eb4b824d32cb..99b0198443af 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Nov 4 13:44:15 PDT 2011 + * Date: Sat Nov 5 17:05:04 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). diff --git a/docs/index.html b/docs/index.html index ff79f84f400b..f22db0e604cb 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2024,7 +2024,7 @@

Ways to compile

- + diff --git a/docs/javascript.html b/docs/javascript.html index 9176ff69806c..82dcffba7572 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -12,7 +12,7 @@ - + diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 7f8ad0fed858..e249c815d714 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -168,10 +168,7 @@ } , tip: function() { - if (!this.$tip) { - this.$tip = $('
').html(this.options.template) - } - return this.$tip + return this.$tip = this.$tip || $('
').html(this.options.template) } , validate: function() { @@ -194,6 +191,10 @@ this.enabled = !this.enabled } + , toggle: function () { + this[this.tip().hasClass('in') ? 'hide' : 'show']() + } + }