From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 8 Jan 2012 23:12:34 +0000 (-0800)
Subject: move hover state out of timeout duh
X-Git-Tag: v2.0.0~6^2~313^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aca72322effb717804af8348d3b58cfa2cbe000;p=thirdparty%2Fbootstrap.git

move hover state out of timeout duh
---

diff --git a/docs/javascript.html b/docs/javascript.html
index 76b5edb87e..f7980d86b5 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -517,7 +517,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
       </div>
     </section>
 
-    <!-- Tips
+    <!-- Twipsy
     ================================================== -->
 
     <section id="twipsy">
diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js
index 756775f43e..b7b802926d 100644
--- a/js/bootstrap-twipsy.js
+++ b/js/bootstrap-twipsy.js
@@ -88,8 +88,8 @@
       if (!self.options.delay || !self.options.delay.hide) {
         self.hide()
       } else {
+        self.hoverState = 'out'
         setTimeout(function() {
-          self.hoverState = 'out'
           if (self.hoverState == 'out') {
             self.hide()
           }