aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-08 15:12:34 -0800
committerJacob Thornton <[email protected]>2012-01-08 15:12:34 -0800
commit7aca72322effb717804af8348d3b58cfa2cbe000 (patch)
tree130a975002aaeffc90344b080de515847ef1f885
parent91d393fd4705faff072a33f9697e0bf194fe40db (diff)
downloadbootstrap-7aca72322effb717804af8348d3b58cfa2cbe000.tar.xz
bootstrap-7aca72322effb717804af8348d3b58cfa2cbe000.zip
move hover state out of timeout duh
-rw-r--r--docs/javascript.html2
-rw-r--r--js/bootstrap-twipsy.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 76b5edb87..f7980d86b 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 756775f43..b7b802926 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()
}