From ed1bd2b150dd645c11f92126a12183985ddbbc15 Mon Sep 17 00:00:00 2001
From: Roland Warmerdam <rowno@webspirited.com>
Date: Sat, 31 Aug 2013 18:03:09 +1200
Subject: carousel: correctly reset when the slide event is prevented

---
 js/carousel.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'js/carousel.js')

diff --git a/js/carousel.js b/js/carousel.js
index d8c4c243c..08d53b893 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -111,13 +111,15 @@
       $next = this.$element.find('.item')[fallback]()
     }
 
-    this.sliding = true
-
-    isCycling && this.pause()
+    if ($next.hasClass('active')) return
 
     var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
+    this.$element.trigger(e)
+    if (e.isDefaultPrevented()) return
 
-    if ($next.hasClass('active')) return
+    this.sliding = true
+
+    isCycling && this.pause()
 
     if (this.$indicators.length) {
       this.$indicators.find('.active').removeClass('active')
@@ -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
-- 
cgit v1.2.3