aboutsummaryrefslogtreecommitdiff
path: root/js/alert.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/alert.js
parent43e5e90a6d871dbbca2ac68429324719692777d3 (diff)
downloadbootstrap-f1009c19b31c24df871b97efa74e8e10791bb2c3.tar.xz
bootstrap-f1009c19b31c24df871b97efa74e8e10791bb2c3.zip
revert collapse change + add emulateTransitionEvent to catch dead css transitions
Diffstat (limited to 'js/alert.js')
-rw-r--r--js/alert.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/alert.js b/js/alert.js
index d9f64767c..6f3d072e9 100644
--- a/js/alert.js
+++ b/js/alert.js
@@ -56,7 +56,9 @@
}
$.support.transition && $parent.hasClass('fade') ?
- $parent.on($.support.transition.end, removeElement) :
+ $parent
+ .one($.support.transition.end, removeElement)
+ .emulateTransitionEnd(150) :
removeElement()
}