Skip to content

B
bootstrap
Commit 8a62f211 authored by fat's avatar fat
Browse files
Options

fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')

parent 76f0d0ff
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dist/js/bootstrap.js
View file @ 8a62f211
...@@ -351,7 +351,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" ...@@ -351,7 +351,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$next = this.$element.find('.item')[fallback]() $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 }) var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
this.$element.trigger(e) this.$element.trigger(e)
......
dist/js/bootstrap.min.js
View file @ 8a62f211
This diff is collapsed.
js/carousel.js
View file @ 8a62f211
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
$next = this.$element.find('.item')[fallback]() $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 }) var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
this.$element.trigger(e) this.$element.trigger(e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment