Merge branch 'master' of github.com:twbs/bootstrap

1bb00011 · Mark Otto · 27697ef7 · b9ca65eb · 1bb00011
Commit 1bb00011 authored 11 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 1 deletion
+1 -1
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -141,7 +141,7 @@
          that.sliding = false
          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
        })
-        .emulateTransitionEnd(600)
+        .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
    } else {
      this.$element.trigger(e)
      if (e.isDefaultPrevented()) return