diff options
| author | Mark Otto <[email protected]> | 2013-11-30 00:55:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 00:55:00 -0800 |
| commit | 080aa7f5c8557b232005cb947df51968d4629656 (patch) | |
| tree | e546cc3ec229d201751e426da36a1b2a586ee428 /js/carousel.js | |
| parent | 441f9d67179f766377eed4b0cedc5dc6eec290e4 (diff) | |
| parent | 819e920d1646f7e9fec8d3dd6ba10dcbd2fa1599 (diff) | |
| download | bootstrap-080aa7f5c8557b232005cb947df51968d4629656.tar.xz bootstrap-080aa7f5c8557b232005cb947df51968d4629656.zip | |
Merge branch 'master' into pr/11299
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
Diffstat (limited to 'js/carousel.js')
| -rw-r--r-- | js/carousel.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/carousel.js b/js/carousel.js index cf7baf2a7..a31bb071f 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.0.0 + * Bootstrap: carousel.js v3.0.2 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -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() @@ -214,4 +214,4 @@ }) }) -}(window.jQuery); +}(jQuery); |