fix transition end

270316f1 · liuyl · b1a1210f · 270316f1 · 270316f1 · 270316f1
Commit 270316f1 authored 11 years ago by liuyl
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 5 deletions
+5 -5
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -50,8 +50,8 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
  // http://blog.alexmaccaw.com/css-transitions
  $.fn.emulateTransitionEnd = function (duration) {
    var called = false, $el    = this
-    $(this).one('webkitTransitionEnd', function () { called = true })
+    $(this).one($.support.transition.end, function () { called = true })
-    var callback = function () { if (!called) $($el).trigger('webkitTransitionEnd') }
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
    setTimeout(callback, duration)
    return this
  }

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- 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 })
+    $(this).one($.support.transition.end, function () { called = true })
-    var callback = function () { if (!called) $($el).trigger('webkitTransitionEnd') }
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
    setTimeout(callback, duration)
    return this
  }