aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-11-05 17:06:41 -0700
committerJacob Thornton <[email protected]>2011-11-05 17:06:41 -0700
commitf03679805e843674736dd84ae165f96b2d6983e5 (patch)
tree93b784bc09324aef4bee27d39667a2db4fd71c48
parent32086c7de59b9a17701aa689225e369d15ac454a (diff)
downloadbootstrap-f03679805e843674736dd84ae165f96b2d6983e5.tar.xz
bootstrap-f03679805e843674736dd84ae165f96b2d6983e5.zip
update to jquery 1.7 + add toggle method to twipsy/popover
-rw-r--r--bootstrap.css2
-rw-r--r--docs/index.html2
-rw-r--r--docs/javascript.html2
-rw-r--r--js/bootstrap-twipsy.js9
4 files changed, 8 insertions, 7 deletions
diff --git a/bootstrap.css b/bootstrap.css
index eb4b824d3..99b019844 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 ff79f84f4..f22db0e60 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2024,7 +2024,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<!-- Le javascript -->
- <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
+ <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
<script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script>$(function () { prettyPrint() })</script>
diff --git a/docs/javascript.html b/docs/javascript.html
index 9176ff698..82dcffba7 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le javascript -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
+ <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script>$(function () { prettyPrint() })</script>
<script src="../js/bootstrap-modal.js"></script>
diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js
index 7f8ad0fed..e249c815d 100644
--- a/js/bootstrap-twipsy.js
+++ b/js/bootstrap-twipsy.js
@@ -168,10 +168,7 @@
}
, tip: function() {
- if (!this.$tip) {
- this.$tip = $('<div class="twipsy" />').html(this.options.template)
- }
- return this.$tip
+ return this.$tip = this.$tip || $('<div class="twipsy" />').html(this.options.template)
}
, validate: function() {
@@ -194,6 +191,10 @@
this.enabled = !this.enabled
}
+ , toggle: function () {
+ this[this.tip().hasClass('in') ? 'hide' : 'show']()
+ }
+
}