diff options
| author | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
| commit | bb4a39d51cd644b212323a7e36f0b5af2682d0ca (patch) | |
| tree | 60ae6687f516cea501f32f5623a5c0aacb950772 /js/carousel.js | |
| parent | 96109d3138fd6f5b67fb1108754e81c077630b36 (diff) | |
| parent | e6eb798178529cf58fab3f33446c0170bae7bdea (diff) | |
| download | bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.tar.xz bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.zip | |
Merge branch 'master' into pr/11388
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'js/carousel.js')
| -rw-r--r-- | js/carousel.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/carousel.js b/js/carousel.js index 902d4d781..a31bb071f 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -69,7 +69,7 @@ if (pos > (this.$items.length - 1) || pos < 0) return - if (this.sliding) return this.$element.one('slid', function () { that.to(pos) }) + if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) if (activeIndex == pos) return this.pause().cycle() return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) @@ -121,7 +121,7 @@ if (this.$indicators.length) { this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { + this.$element.one('slid.bs.carousel', function () { var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) $nextIndicator && $nextIndicator.addClass('active') }) @@ -139,7 +139,7 @@ $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) + setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) }) .emulateTransitionEnd(600) } else { @@ -148,7 +148,7 @@ $active.removeClass('active') $next.addClass('active') this.sliding = false - this.$element.trigger('slid') + this.$element.trigger('slid.bs.carousel') } isCycling && this.cycle() |