aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/js/bootstrap.js
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-05-31 10:24:23 -0700
committerJacob Thornton <[email protected]>2012-05-31 10:24:23 -0700
commit4eaeea81fd909e6711f57049fc4372f4045fa5aa (patch)
treed18bee94b6a27f090cde398f57611fb0e3ca6fc9 /docs/assets/js/bootstrap.js
parentbcd5097c0267a8285c2b60fd3b751cd3ae78ad7a (diff)
downloadbootstrap-4eaeea81fd909e6711f57049fc4372f4045fa5aa.tar.xz
bootstrap-4eaeea81fd909e6711f57049fc4372f4045fa5aa.zip
rebuild and fix test
Diffstat (limited to 'docs/assets/js/bootstrap.js')
-rw-r--r--docs/assets/js/bootstrap.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
index 724495410..7b267fc23 100644
--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@ -968,9 +968,9 @@
, leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+ if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
- clearTimeout(this.timeout)
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide()
@@ -1156,7 +1156,8 @@
, delay: 0
}
-}(window.jQuery);/* ===========================================================
+}(window.jQuery);
+/* ===========================================================
* bootstrap-popover.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================