]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
clear timeout to reset delays for tooltip/popover
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 22 Mar 2012 04:57:06 +0000 (21:57 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 22 Mar 2012 04:57:06 +0000 (21:57 -0700)
docs/assets/bootstrap.zip
docs/assets/js/bootstrap-tooltip.js
js/bootstrap-tooltip.js

index a4e3982293deab6368fa5b04f8c4cdb081a2fd63..4742135efa4c282b665bdccb21a400b62b2fc6de 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index 2b5f146b13b47fd91b17fc3befacb009f816e0cf..7d58a6c8d2fc5d9163af00fe5a9ba82028815e83 100644 (file)
@@ -73,8 +73,9 @@
       if (!self.options.delay || !self.options.delay.show) {
         self.show()
       } else {
+        clearTimeout(this.timeout)
         self.hoverState = 'in'
-        setTimeout(function() {
+        this.timeout = setTimeout(function() {
           if (self.hoverState == 'in') {
             self.show()
           }
@@ -88,8 +89,9 @@
       if (!self.options.delay || !self.options.delay.hide) {
         self.hide()
       } else {
+        clearTimeout(this.timeout)
         self.hoverState = 'out'
-        setTimeout(function() {
+        this.timeout = setTimeout(function() {
           if (self.hoverState == 'out') {
             self.hide()
           }
index 2b5f146b13b47fd91b17fc3befacb009f816e0cf..7d58a6c8d2fc5d9163af00fe5a9ba82028815e83 100644 (file)
@@ -73,8 +73,9 @@
       if (!self.options.delay || !self.options.delay.show) {
         self.show()
       } else {
+        clearTimeout(this.timeout)
         self.hoverState = 'in'
-        setTimeout(function() {
+        this.timeout = setTimeout(function() {
           if (self.hoverState == 'in') {
             self.show()
           }
@@ -88,8 +89,9 @@
       if (!self.options.delay || !self.options.delay.hide) {
         self.hide()
       } else {
+        clearTimeout(this.timeout)
         self.hoverState = 'out'
-        setTimeout(function() {
+        this.timeout = setTimeout(function() {
           if (self.hoverState == 'out') {
             self.hide()
           }