]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Carousel: Use the transition duration from CSS 11416/head
authorDaniel Bøndergaard <danielboendergaard@gmail.com>
Fri, 8 Nov 2013 10:55:06 +0000 (11:55 +0100)
committerDaniel Bøndergaard <danielboendergaard@gmail.com>
Fri, 8 Nov 2013 10:55:06 +0000 (11:55 +0100)
This makes it possible to change the transition duration in CSS

js/carousel.js

index 902d4d781e2998472814ae5057fd59945ebce9f5..08a45a4f56e64a02162731538c80f5c01d858bb8 100644 (file)
           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