diff options
| author | Mark Otto <otto@github.com> | 2012-12-21 01:47:36 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-12-21 01:47:36 +0400 |
| commit | a5e04c0799b64421f413321c29455e93187ad35a (patch) | |
| tree | 44d69a1f19000ae4e8156ffc5b73dc843d244975 /docs/assets/js/bootstrap-carousel.js | |
| parent | 00ff34b9e6671d9363ce5cb1d11aaa6bd45e995a (diff) | |
| parent | 5e4f663e699d6c03cf6c778d39ecac6cb949e285 (diff) | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
Diffstat (limited to 'docs/assets/js/bootstrap-carousel.js')
| -rw-r--r-- | docs/assets/js/bootstrap-carousel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 371f9d78aa..d9c580e855 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/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() }) } |