Skip to content

Commit

Permalink
fixes twbs#11379 - Fix carousel this.sliding not getting reset if $ne…
Browse files Browse the repository at this point in the history
…xt.hasClass('active')
  • Loading branch information
fat committed Dec 30, 2013
1 parent 76f0d0f commit 8a62f21
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dist/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$next = this.$element.find('.item')[fallback]()
}

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

var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
this.$element.trigger(e)
Expand Down
Loading

0 comments on commit 8a62f21

Please sign in to comment.