diff options
| author | Daniel Bøndergaard <[email protected]> | 2013-11-08 11:55:06 +0100 |
|---|---|---|
| committer | Daniel Bøndergaard <[email protected]> | 2013-11-08 11:55:06 +0100 |
| commit | 268f20e84c812de9eb2cbe13261c6fe70f591857 (patch) | |
| tree | 2d748d34a478a679f04ff08ed28b0121ca5ddeda | |
| parent | 463343af63344dbbc3db04f40b0b804baa919b7e (diff) | |
| download | bootstrap-268f20e84c812de9eb2cbe13261c6fe70f591857.tar.xz bootstrap-268f20e84c812de9eb2cbe13261c6fe70f591857.zip | |
Carousel: Use the transition duration from CSS
This makes it possible to change the transition duration in 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 902d4d781..08a45a4f5 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -141,7 +141,7 @@ that.sliding = false setTimeout(function () { that.$element.trigger('slid') }, 0) }) - .emulateTransitionEnd(600) + .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000) } else { this.$element.trigger(e) if (e.isDefaultPrevented()) return |