diff options
| author | Mark Otto <[email protected]> | 2013-12-18 15:12:51 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 15:12:51 -0800 |
| commit | 1bb000118971a5c68d8e7ececfb098ceec18d8b3 (patch) | |
| tree | 736eb4639e7101a0f30e50d3c33eb22bd35ec3f4 | |
| parent | 27697ef7e3e29c17eadb077054fbf85d9d8e6885 (diff) | |
| parent | b9ca65ebe7b726868dccc225026859f4ed43d9ad (diff) | |
| download | bootstrap-1bb000118971a5c68d8e7ececfb098ceec18d8b3.tar.xz bootstrap-1bb000118971a5c68d8e7ececfb098ceec18d8b3.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | js/carousel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/carousel.js b/js/carousel.js index 67cf0e569..b55184bc4 100644 --- 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 |