diff options
| author | Mark Otto <[email protected]> | 2013-12-18 15:13:50 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 15:13:50 -0800 |
| commit | 922cd046ef897a115d4db13e8fa6327d7b0a97ad (patch) | |
| tree | adde8864a0da16667d0826378c7597a635ab3544 /dist/js/bootstrap.js | |
| parent | 1bb000118971a5c68d8e7ececfb098ceec18d8b3 (diff) | |
| download | bootstrap-922cd046ef897a115d4db13e8fa6327d7b0a97ad.tar.xz bootstrap-922cd046ef897a115d4db13e8fa6327d7b0a97ad.zip | |
grunt after that carousel merge
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 15537f2db..70568f688 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -421,7 +421,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" 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 |