aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJørgen Borgesen <[email protected]>2012-05-14 14:03:36 +0200
committerJørgen Borgesen <[email protected]>2012-05-14 14:03:36 +0200
commite9a7d26d0636445fb20def22db54fe703164031b (patch)
tree3de045e68bcbd88112a930761cfe6639d619aea5
parentb261f9781bbf31f499cb55c49451dc0c0ad43062 (diff)
downloadbootstrap-e9a7d26d0636445fb20def22db54fe703164031b.tar.xz
bootstrap-e9a7d26d0636445fb20def22db54fe703164031b.zip
Cancel running timer for tooltips with delayed show, but instant hide. This prevents delayed tooltips from appearing if the mouse leaves the elements before tooltip is showed and the hiding delay is 0.
-rw-r--r--js/bootstrap-tooltip.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 577ead48b..4c2a2a328 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -84,6 +84,7 @@
, 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)
@@ -272,4 +273,4 @@
, delay: 0
}
-}(window.jQuery); \ No newline at end of file
+}(window.jQuery);