diff options
| author | Mark Otto <[email protected]> | 2012-06-02 22:14:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-06-02 22:14:12 -0700 |
| commit | 9a4ee790e1e58e321b604bb66380b2ce2f00faf6 (patch) | |
| tree | ac9099103a98153aeb5d69c674af5546c6aa926b /js/bootstrap-carousel.js | |
| parent | 9a3a297a478e1a27cce913b8d30170a6949b52f7 (diff) | |
| parent | 2d3a0babd242d7eebe09cf3f4daad38e2d7df6ee (diff) | |
| download | bootstrap-9a4ee790e1e58e321b604bb66380b2ce2f00faf6.tar.xz bootstrap-9a4ee790e1e58e321b604bb66380b2ce2f00faf6.zip | |
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'js/bootstrap-carousel.js')
| -rw-r--r-- | js/bootstrap-carousel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index e0dadd213..1bb8f5a06 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -46,7 +46,7 @@ } , to: function (pos) { - var $active = this.$element.find('.active') + var $active = this.$element.find('.item.active') , children = $active.parent().children() , activePos = children.index($active) , that = this |