From f1009c19b31c24df871b97efa74e8e10791bb2c3 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 23 Jul 2013 18:44:08 -0700
Subject: revert collapse change + add emulateTransitionEvent to catch dead css
 transitions

---
 js/tooltip.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'js/tooltip.js')

diff --git a/js/tooltip.js b/js/tooltip.js
index 1f84b5cf5..f8ba0aacb 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -238,19 +238,10 @@
 
     $tip.removeClass('in')
 
-    function removeWithAnimation() {
-      var timeout = setTimeout(function () {
-        $tip.off($.support.transition.end).detach()
-      }, 500)
-
-      $tip.one($.support.transition.end, function () {
-        clearTimeout(timeout)
-        $tip.detach()
-      })
-    }
-
     $.support.transition && this.$tip.hasClass('fade') ?
-      removeWithAnimation() :
+      $tip
+        .one($.support.transition.end, $tip.detach)
+        .emulateTransitionEnd(150) :
       $tip.detach()
 
     this.$element.trigger('hidden.bs.' + this.type)
-- 
cgit v1.2.3