mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-06 21:56:42 +02:00
Code Issues Releases Wiki Activity

Merge pull request #11416 from danielboendergaard/carousel-duration

Browse Source 
Carousel: Use the transition duration from CSS
This commit is contained in:
Mark Otto
2013-12-18 15:01:47 -08:00
parent e8e60ae4bc 268f20e84c
commit b9ca65ebe7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/carousel.js
View File

@@ -141,7 +141,7 @@
that.sliding = false that.sliding = false
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
}) })
.emulateTransitionEnd(600) .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
} else { } else {
this.$element.trigger(e) this.$element.trigger(e)
if (e.isDefaultPrevented()) return if (e.isDefaultPrevented()) return