aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorliuyl <[email protected]>2013-07-29 20:23:01 +0800
committerliuyl <[email protected]>2013-07-29 20:23:01 +0800
commit270316f140e821d7ba9a5675def47086abe4fc39 (patch)
treef05741e01971a9ae82a8fe4793e722282a4ca089 /js
parentb1a1210f071b696450f323f35b55b399a17d5396 (diff)
downloadbootstrap-270316f140e821d7ba9a5675def47086abe4fc39.tar.xz
bootstrap-270316f140e821d7ba9a5675def47086abe4fc39.zip
fix transition end
Diffstat (limited to 'js')
-rw-r--r--js/transition.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/transition.js b/js/transition.js
index dfb64108b..0cdcf9ea3 100644
--- a/js/transition.js
+++ b/js/transition.js
@@ -43,8 +43,8 @@
// http://blog.alexmaccaw.com/css-transitions
$.fn.emulateTransitionEnd = function (duration) {
var called = false, $el = this
- $(this).one('webkitTransitionEnd', function () { called = true })
- var callback = function () { if (!called) $($el).trigger('webkitTransitionEnd') }
+ $(this).one($.support.transition.end, function () { called = true })
+ var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
setTimeout(callback, duration)
return this
}