aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorfat <[email protected]>2013-12-29 19:01:32 -0800
committerfat <[email protected]>2013-12-29 19:01:32 -0800
commit8a62f211131e2a5be7b7413281845c2f66716be4 (patch)
tree7bfa680be8de312595bd535cefef30fed8044f55 /js
parent76f0d0ff32b6946dbd8c667a517a4deb69ad8890 (diff)
downloadbootstrap-8a62f211131e2a5be7b7413281845c2f66716be4.tar.xz
bootstrap-8a62f211131e2a5be7b7413281845c2f66716be4.zip
fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')
Diffstat (limited to 'js')
-rw-r--r--js/carousel.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/carousel.js b/js/carousel.js
index fbd055116..a9a2eb2d1 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -100,7 +100,7 @@
$next = this.$element.find('.item')[fallback]()
}
- if ($next.hasClass('active')) return
+ if ($next.hasClass('active')) return this.sliding = false
var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
this.$element.trigger(e)