]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Cancel running timer for tooltips with delayed show, but instant hide. This prevents... 3478/head
authorJørgen Borgesen <joergen.borgesen@gmail.com>
Mon, 14 May 2012 12:03:36 +0000 (14:03 +0200)
committerJørgen Borgesen <joergen.borgesen@gmail.com>
Mon, 14 May 2012 12:03:36 +0000 (14:03 +0200)
js/bootstrap-tooltip.js

index 577ead48b56eeb08e2caa4f88bd8fc3da009654b..4c2a2a328d1ab7c0de31122241eb9db35eb9542a 100644 (file)
@@ -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)
   , delay: 0
   }
 
-}(window.jQuery);
\ No newline at end of file
+}(window.jQuery);