aboutsummaryrefslogtreecommitdiff
path: root/js/tab.js
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2013-07-23 18:44:08 -0700
committerJacob Thornton <[email protected]>2013-07-23 18:44:08 -0700
commitf1009c19b31c24df871b97efa74e8e10791bb2c3 (patch)
tree2bac5a675e252d6bf81fe6d17f345de508c0f313 /js/tab.js
parent43e5e90a6d871dbbca2ac68429324719692777d3 (diff)
downloadbootstrap-f1009c19b31c24df871b97efa74e8e10791bb2c3.tar.xz
bootstrap-f1009c19b31c24df871b97efa74e8e10791bb2c3.zip
revert collapse change + add emulateTransitionEvent to catch dead css transitions
Diffstat (limited to 'js/tab.js')
-rw-r--r--js/tab.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/tab.js b/js/tab.js
index 89dbb8b70..cacda7d66 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -88,7 +88,9 @@
}
transition ?
- $active.one($.support.transition.end, next) :
+ $active
+ .one($.support.transition.end, next)
+ .emulateTransitionEnd(150) :
next()
$active.removeClass('in')