aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-06-02 20:28:08 -0700
committerJacob Thornton <[email protected]>2012-06-02 20:28:08 -0700
commit555a3b0478b001022d503304d7e5a7118bf8e3a5 (patch)
tree52060799deb2129f0d8ee270b653b7af8fac25fb /js
parent0b827965d36f87feddcee1ecb3f6e2f9c6dec9dc (diff)
downloadbootstrap-555a3b0478b001022d503304d7e5a7118bf8e3a5.tar.xz
bootstrap-555a3b0478b001022d503304d7e5a7118bf8e3a5.zip
fix carousel when hiding a reshowing - make sure it always triggers transition end #3248
Diffstat (limited to 'js')
-rw-r--r--js/bootstrap-carousel.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 1a82374cc..3938ddd6e 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -68,6 +68,10 @@
, pause: function (e) {
if (!e) this.paused = true
+ if (this.$element.find('.next, .prev')) {
+ this.$element.trigger($.support.transition.end)
+ this.cycle()
+ }
clearInterval(this.interval)
this.interval = null
return this