diff --git a/js/carousel.js b/js/carousel.js index d8c4c243ca..08d53b893d 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -111,14 +111,16 @@ $next = this.$element.find('.item')[fallback]() } + if ($next.hasClass('active')) return + + var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + this.sliding = true isCycling && this.pause() - var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) - - if ($next.hasClass('active')) return - if (this.$indicators.length) { this.$indicators.find('.active').removeClass('active') this.$element.one('slid', function () { @@ -128,8 +130,6 @@ } if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return $next.addClass(type) $next[0].offsetWidth // force reflow $active.addClass(direction) @@ -143,8 +143,6 @@ }) .emulateTransitionEnd(600) } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return $active.removeClass('active') $next.addClass('active') this.sliding = false diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js index badf0886d3..e1e34afaf6 100644 --- a/js/tests/unit/carousel.js +++ b/js/tests/unit/carousel.js @@ -16,7 +16,7 @@ $(function () { ok($(document.body).carousel()[0] == document.body, 'document.body returned') }) - test("should not fire sliden when slide is prevented", function () { + test("should not fire slid when slide is prevented", function () { $.support.transition = false stop() $('