diff options
| author | Mark Otto <[email protected]> | 2012-12-20 13:41:08 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-20 13:41:08 -0800 |
| commit | b6575cc72e144378dd2c1d4e6f23ac80a167c195 (patch) | |
| tree | 8c7b5a288453d8f706b6e27f1de24594deda89bc /docs/assets/js/bootstrap.js | |
| parent | 30d8eb3ed572f2a91c0d4de1326779dec88cd911 (diff) | |
| download | bootstrap-b6575cc72e144378dd2c1d4e6f23ac80a167c195.tar.xz bootstrap-b6575cc72e144378dd2c1d4e6f23ac80a167c195.zip | |
fix up code snippet
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 2e06798f2..e6f4969ad 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -425,7 +425,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() }) } @@ -510,7 +510,7 @@ , actives , hasData - if (this.transitioning) return + if (this.transitioning || this.$element.hasClass('in')) return dimension = this.dimension() scroll = $.camelCase(['scroll', dimension].join('-')) |