diff options
| author | Mark Otto <[email protected]> | 2013-08-16 00:36:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-16 00:36:46 -0700 |
| commit | afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a (patch) | |
| tree | f1e15a8e540f2b3fece2dc6cd817b49a3a76a98f /js/carousel.js | |
| parent | afef74d03d393863048f7374a1ff9e0c4ad93bbb (diff) | |
| parent | 2fa0975956f646be627aaa4732527f6de5335a2c (diff) | |
| download | bootstrap-afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a.tar.xz bootstrap-afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
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 |