diff options
| author | Mark Otto <[email protected]> | 2013-03-01 12:37:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-01 12:37:21 -0800 |
| commit | a70c50d1f70ffa1582a2bdba7a9a0ce6c40fd60b (patch) | |
| tree | 9469244a7e9b607e360e860149b5211367d25be9 /js/bootstrap-carousel.js | |
| parent | 77e8e2aee9d560b9152ddb8f214da2aa6e03d516 (diff) | |
| parent | eb24718add4dd36fe92fdbdb79e6ff4ce5919300 (diff) | |
| download | bootstrap-a70c50d1f70ffa1582a2bdba7a9a0ce6c40fd60b.tar.xz bootstrap-a70c50d1f70ffa1582a2bdba7a9a0ce6c40fd60b.zip | |
Merge branch 'master' into 3.0.0-wip
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/index.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
package.json
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 83cdffd0e..3a9d980c4 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -75,7 +75,7 @@ if (!e) this.paused = true if (this.$element.find('.next, .prev').length && $.support.transition.end) { this.$element.trigger($.support.transition.end) - this.cycle() + this.cycle(true) } clearInterval(this.interval) this.interval = null |