diff options
| author | Mark Otto <[email protected]> | 2013-08-11 16:07:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-11 16:07:57 -0700 |
| commit | 83c236f5705822882e094d08e0bfa193d4e9f4ae (patch) | |
| tree | d40492c1297799c6e37f22b20e5eb123240164df /js/carousel.js | |
| parent | 1ff1dfb2bd031832c725c146deb8b7363cfeadf5 (diff) | |
| parent | 92c2ad98e753c64a2bd6e3fb94870a2ad3ee0333 (diff) | |
| download | bootstrap-83c236f5705822882e094d08e0bfa193d4e9f4ae.tar.xz bootstrap-83c236f5705822882e094d08e0bfa193d4e9f4ae.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'js/carousel.js')
| -rw-r--r-- | js/carousel.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/js/carousel.js b/js/carousel.js index d4bcb88b7..d8c4c243c 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -41,6 +41,7 @@ Carousel.DEFAULTS = { interval: 5000 , pause: 'hover' + , wrap: true } Carousel.prototype.cycle = function (e) { @@ -105,12 +106,15 @@ var fallback = type == 'next' ? 'first' : 'last' var that = this + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() + } + this.sliding = true isCycling && this.pause() - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) if ($next.hasClass('active')) return |