diff options
| author | Mark Otto <[email protected]> | 2012-12-20 01:30:43 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-20 01:30:43 -0800 |
| commit | 3f493f0d0d81d21c3d6aa6ffac7e881ca00654e6 (patch) | |
| tree | 938c1d3757c0f6abbf036202955f885d16b0c12f | |
| parent | f706acb11cdfaab03ecc7249dee7ed48228a41fa (diff) | |
| parent | 5abe33f5d84e8b7357f50744a7ce7d4420745dd8 (diff) | |
| download | bootstrap-3f493f0d0d81d21c3d6aa6ffac7e881ca00654e6.tar.xz bootstrap-3f493f0d0d81d21c3d6aa6ffac7e881ca00654e6.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
| -rw-r--r-- | js/bootstrap-carousel.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-collapse.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 6a1b21f37..4838a1684 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -164,7 +164,7 @@ if (!data) $this.data('carousel', (data = new Carousel(this, options))) if (typeof option == 'number') data.to(option) else if (action) data[action]() - else if (options.interval) data.cycle() + else if (options.interval) data.pause().cycle() }) } diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 9e7211218..6755aa7e2 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -52,7 +52,7 @@ , actives , hasData - if (this.transitioning) return + if (this.transitioning || this.$element.hasClass('in')) return dimension = this.dimension() scroll = $.camelCase(['scroll', dimension].join('-')) |