Skip to content

Commit

Permalink
honor wrap option in Carousel.getItemForDirection; fixes #15144
Browse files Browse the repository at this point in the history
  • Loading branch information
cvrebert committed Nov 16, 2014
1 parent 8008fe7 commit b7398bc
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions js/carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,11 @@
}

Carousel.prototype.getItemForDirection = function (direction, active) {
var delta = direction == 'prev' ? -1 : 1
var activeIndex = this.getItemIndex(active)
var willWrap = (direction == 'prev' && activeIndex === 0)
|| (direction == 'next' && activeIndex == (this.$items.length - 1))
if (willWrap && !this.options.wrap) return active
var delta = direction == 'prev' ? -1 : 1
var itemIndex = (activeIndex + delta) % this.$items.length
return this.$items.eq(itemIndex)
}
Expand Down Expand Up @@ -116,14 +119,8 @@
var $next = next || this.getItemForDirection(type, $active)
var isCycling = this.interval
var direction = type == 'next' ? 'left' : 'right'
var fallback = type == 'next' ? 'first' : 'last'
var that = this

if (!$next.length) {
if (!this.options.wrap) return
$next = this.$element.find('.item')[fallback]()
}

if ($next.hasClass('active')) return (this.sliding = false)

var relatedTarget = $next[0]
Expand Down

0 comments on commit b7398bc

Please sign in to comment.