diff options
| author | Mark Otto <[email protected]> | 2013-12-18 15:01:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 15:01:47 -0800 |
| commit | b9ca65ebe7b726868dccc225026859f4ed43d9ad (patch) | |
| tree | 4290b073616596af33953e29a6b8434389298cdf | |
| parent | e8e60ae4bce85eed17c7e6801b72404494ef436a (diff) | |
| parent | 268f20e84c812de9eb2cbe13261c6fe70f591857 (diff) | |
| download | bootstrap-b9ca65ebe7b726868dccc225026859f4ed43d9ad.tar.xz bootstrap-b9ca65ebe7b726868dccc225026859f4ed43d9ad.zip | |
Merge pull request #11416 from danielboendergaard/carousel-duration
Carousel: Use the transition duration from CSS
| -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 |