From eaefed517a960893204cade3525bda100454e13f Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 24 Jul 2013 20:10:16 -0700
Subject: fixes #8399 w/ tests

---
 js/tooltip.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/tooltip.js')

diff --git a/js/tooltip.js b/js/tooltip.js
index 7e3fa8098..897a44517 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -102,10 +102,10 @@
     var self = obj instanceof this.constructor ?
       obj : $(obj.currentTarget)[this.type](options).data('bs.' + this.type)
 
-    if (!self.options.delay || !self.options.delay.show) return self.show()
-
     clearTimeout(self.timeout)
 
+    if (!self.options.delay || !self.options.delay.show) return self.show()
+
     self.hoverState = 'in'
     self.timeout    = setTimeout(function () {
       if (self.hoverState == 'in') self.show()
-- 
cgit v1.2.3