From: Mark Otto <markdotto@gmail.com>
Date: Wed, 18 Dec 2013 23:01:47 +0000 (-0800)
Subject: Merge pull request #11416 from danielboendergaard/carousel-duration
X-Git-Tag: v3.1.0~141^2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ca65ebe7b726868dccc225026859f4ed43d9ad;p=thirdparty%2Fbootstrap.git

Merge pull request #11416 from danielboendergaard/carousel-duration

Carousel: Use the transition duration from CSS
---

b9ca65ebe7b726868dccc225026859f4ed43d9ad
diff --cc js/carousel.js
index 67cf0e5694,08a45a4f56..b55184bc42
--- a/js/carousel.js
+++ b/js/carousel.js
@@@ -139,9 -139,9 +139,9 @@@
            $next.removeClass([type, direction].join(' ')).addClass('active')
            $active.removeClass(['active', direction].join(' '))
            that.sliding = false
 -          setTimeout(function () { that.$element.trigger('slid') }, 0)
 +          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