aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-02-20 22:01:38 -0800
committerJacob Thornton <[email protected]>2012-02-20 22:01:38 -0800
commitf046c12bd21b03d9b34e7e5f6386f7f4b614eace (patch)
tree3567e050902edea89a1c16cf022c1562adbf6a8c
parent06d4756114f55406b99d20a83eec95039d9af4bd (diff)
downloadbootstrap-f046c12bd21b03d9b34e7e5f6386f7f4b614eace.tar.xz
bootstrap-f046c12bd21b03d9b34e7e5f6386f7f4b614eace.zip
fix cycling in carousel
-rw-r--r--js/bootstrap-carousel.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 810256e80..aef98fb05 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -83,14 +83,14 @@
, fallback = type == 'next' ? 'first' : 'last'
, that = this
- if (!$next.length) return
-
this.sliding = true
isCycling && this.pause()
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
+ if ($next.hasClass('active')) return
+
if (!$.support.transition && this.$element.hasClass('slide')) {
this.$element.trigger('slide')
$active.removeClass('active')