0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00

grunt after that carousel merge

This commit is contained in:
Mark Otto 2013-12-18 15:13:50 -08:00
parent 1bb0001189
commit 922cd046ef
3 changed files with 3 additions and 3 deletions

View File

@ -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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long