Skip to content

Commit f036798

Browse files
committed
update to jquery 1.7 + add toggle method to twipsy/popover
1 parent 32086c7 commit f036798

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

bootstrap.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* http://www.apache.org/licenses/LICENSE-2.0
77
*
88
* Designed and built with all the love in the world @twitter by @mdo and @fat.
9-
* Date: Fri Nov 4 13:44:15 PDT 2011
9+
* Date: Sat Nov 5 17:05:04 PDT 2011
1010
*/
1111
/* Reset.less
1212
* 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).

docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2024,7 +2024,7 @@ <h3>Ways to compile</h3>
20242024

20252025

20262026
<!-- Le javascript -->
2027-
<script src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
2027+
<script src="http://code.jquery.com/jquery-1.7.min.js"></script>
20282028
<script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
20292029
<script src="assets/js/google-code-prettify/prettify.js"></script>
20302030
<script>$(function () { prettyPrint() })</script>

docs/javascript.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<![endif]-->
1313

1414
<!-- Le javascript -->
15-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
15+
<script src="http://code.jquery.com/jquery-1.7.min.js"></script>
1616
<script src="assets/js/google-code-prettify/prettify.js"></script>
1717
<script>$(function () { prettyPrint() })</script>
1818
<script src="../js/bootstrap-modal.js"></script>

js/bootstrap-twipsy.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,7 @@
168168
}
169169

170170
, tip: function() {
171-
if (!this.$tip) {
172-
this.$tip = $('<div class="twipsy" />').html(this.options.template)
173-
}
174-
return this.$tip
171+
return this.$tip = this.$tip || $('<div class="twipsy" />').html(this.options.template)
175172
}
176173

177174
, validate: function() {
@@ -194,6 +191,10 @@
194191
this.enabled = !this.enabled
195192
}
196193

194+
, toggle: function () {
195+
this[this.tip().hasClass('in') ? 'hide' : 'show']()
196+
}
197+
197198
}
198199

199200

0 commit comments

Comments
 (0)