fix(transitionning): merge bootstrap fix for component is transitionn…

…ing. See issue #50
Orange-OpenSource · Apr 3, 2017 · bb16f76 · bb16f76
1 parent f60303c
commit bb16f76
Show file tree

Hide file tree

Showing 15 changed files with 106 additions and 95 deletions.
diff --git a/js/dist/carousel.js b/js/dist/carousel.js
diff --git a/js/dist/carousel.js.map b/js/dist/carousel.js.map
diff --git a/js/dist/collapse.js b/js/dist/collapse.js
diff --git a/js/dist/collapse.js.map b/js/dist/collapse.js.map
diff --git a/js/dist/scrollspy.js b/js/dist/scrollspy.js
diff --git a/js/dist/scrollspy.js.map b/js/dist/scrollspy.js.map
diff --git a/js/dist/tooltip.js b/js/dist/tooltip.js
diff --git a/js/dist/tooltip.js.map b/js/dist/tooltip.js.map
diff --git a/js/dist/util.js b/js/dist/util.js
diff --git a/js/dist/util.js.map b/js/dist/util.js.map
diff --git a/js/src/carousel.js b/js/src/carousel.js
@@ -120,10 +120,9 @@ const Carousel = (($) => {
     // public
 
     next() {
-      if (this._isSliding) {
-        throw new Error('Carousel is sliding')
+      if (!this._isSliding) {
+        this._slide(Direction.NEXT)
       }
-      this._slide(Direction.NEXT)
     }
 
     nextWhenVisible() {
@@ -134,10 +133,9 @@ const Carousel = (($) => {
     }
 
     prev() {
-      if (this._isSliding) {
-        throw new Error('Carousel is sliding')
+      if (!this._isSliding) {
+        this._slide(Direction.PREV)
       }
-      this._slide(Direction.PREV)
     }
 
     pause(event) {
@@ -282,9 +280,13 @@ const Carousel = (($) => {
 
 
     _triggerSlideEvent(relatedTarget, eventDirectionName) {
+      const targetIndex = this._getItemIndex(relatedTarget)
+      const fromIndex = this._getItemIndex($(this._element).find(Selector.ACTIVE_ITEM)[0])
       const slideEvent = $.Event(Event.SLIDE, {
         relatedTarget,
-        direction: eventDirectionName
+        direction: eventDirectionName,
+        from: fromIndex,
+        to: targetIndex
       })
 
       $(this._element).trigger(slideEvent)
@@ -310,9 +312,10 @@ const Carousel = (($) => {
 
     _slide(direction, element) {
       const activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0]
+      const activeElementIndex = this._getItemIndex(activeElement)
       const nextElement   = element || activeElement &&
         this._getItemByDirection(direction, activeElement)
-
+      const nextElementIndex = this._getItemIndex(nextElement)
       const isCycling = Boolean(this._interval)
 
       let directionalClassName
@@ -354,7 +357,9 @@ const Carousel = (($) => {
 
       const slidEvent = $.Event(Event.SLID, {
         relatedTarget: nextElement,
-        direction: eventDirectionName
+        direction: eventDirectionName,
+        from: activeElementIndex,
+        to: nextElementIndex
       })
 
       if (Util.supportsTransitionEnd() &&