aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-06-20 10:58:20 -0700
committerJacob Thornton <[email protected]>2012-06-20 10:58:20 -0700
commiteb62c977cd78d85b82900267268e13f2314a176b (patch)
treed69a59666a8dd3f5c8c5a40a0d7ca2aed886c491
parentb2b000b7502901e53cf499e68d8dd5bf522d3d4f (diff)
parentc028e333586c7ecdbc4cec6ca88ea99b26a11358 (diff)
downloadbootstrap-eb62c977cd78d85b82900267268e13f2314a176b.tar.xz
bootstrap-eb62c977cd78d85b82900267268e13f2314a176b.zip
Merge pull request #3770 from Barryvdh/2.1.0-wip
Scope carousel .active to .item
-rw-r--r--js/bootstrap-carousel.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index f8f3c6451..3fda7c666 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -88,7 +88,7 @@
}
, slide: function (type, next) {
- var $active = this.$element.find('.active')
+ var $active = this.$element.find('.item.active')
, $next = next || $active[type]()
, isCycling = this.interval
, direction = type == 'next' ? 'left' : 'right'