From: Daniel Bøndergaard <danielboendergaard@gmail.com>
Date: Fri, 8 Nov 2013 10:55:06 +0000 (+0100)
Subject: Carousel: Use the transition duration from CSS
X-Git-Tag: v3.1.0~141^2~5^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=268f20e84c812de9eb2cbe13261c6fe70f591857;p=thirdparty%2Fbootstrap.git

Carousel: Use the transition duration from CSS

This makes it possible to change the transition duration in CSS
---

diff --git a/js/carousel.js b/js/carousel.js
index 902d4d781e..08a45a4f56 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