No commit message

thednp · Feb 1, 2021 · e3719ee · e3719ee
1 parent 964f9ac
commit e3719ee
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/dist/bootstrap-native-v5-esm.js b/dist/bootstrap-native-v5-esm.js
@@ -502,7 +502,7 @@ function Carousel( carouselElement, carouselOptions ){
         orientation = direction === 'left' ? 'next' : 'prev',
         directionClass = direction === 'left' ? 'start' : 'end';
 
-    if ( element[carouselComponent] ){
+    if ( isAnimating && element[carouselComponent] ){
       isAnimating = false;
 
       addClass( slides[next], activeClass );
@@ -562,8 +562,6 @@ function Carousel( carouselElement, carouselOptions ){
 
     var eventTarget = e.currentTarget || e.srcElement;
 
-    if ( isAnimating ) { return }
-
     if ( controls[1] && eventTarget === controls[1] ) {
       self.next();
     } else if ( controls[1] && eventTarget === controls[0] ) {
@@ -575,7 +573,7 @@ function Carousel( carouselElement, carouselOptions ){
     var which = ref.which;
 
 
-    if ( isAnimating || !isElementInScrollRange( element ) ) { return }
+    if ( !isElementInScrollRange( element ) ) { return }
 
     switch ( which ) {
       case 39:
@@ -747,11 +745,11 @@ function Carousel( carouselElement, carouselOptions ){
   };
 
   CarouselProto.next = function() {
-    index++, self.to( index );
+    !isAnimating && index++, self.to( index );
   };
 
   CarouselProto.prev = function() {
-    index--, self.to( index );
+    !isAnimating && index--, self.to( index );
   };
 
   CarouselProto.to = function( next ) {

diff --git a/dist/bootstrap-native-v5-esm.min.js b/dist/bootstrap-native-v5-esm.min.js
diff --git a/dist/bootstrap-native-v5.js b/dist/bootstrap-native-v5.js
@@ -508,7 +508,7 @@
           orientation = direction === 'left' ? 'next' : 'prev',
           directionClass = direction === 'left' ? 'start' : 'end';
 
-      if ( element[carouselComponent] ){
+      if ( isAnimating && element[carouselComponent] ){
         isAnimating = false;
 
         addClass( slides[next], activeClass );
@@ -568,8 +568,6 @@
 
       var eventTarget = e.currentTarget || e.srcElement;
 
-      if ( isAnimating ) { return }
-
       if ( controls[1] && eventTarget === controls[1] ) {
         self.next();
       } else if ( controls[1] && eventTarget === controls[0] ) {
@@ -581,7 +579,7 @@
       var which = ref.which;
 
 
-      if ( isAnimating || !isElementInScrollRange( element ) ) { return }
+      if ( !isElementInScrollRange( element ) ) { return }
 
       switch ( which ) {
         case 39:
@@ -753,11 +751,11 @@
     };
 
     CarouselProto.next = function() {
-      index++, self.to( index );
+      !isAnimating && index++, self.to( index );
     };
 
     CarouselProto.prev = function() {
-      index--, self.to( index );
+      !isAnimating && index--, self.to( index );
     };
 
     CarouselProto.to = function( next ) {

diff --git a/dist/bootstrap-native-v5.min.js b/dist/bootstrap-native-v5.min.js
diff --git a/src/components-v5/carousel-native.js b/src/components-v5/carousel-native.js
@@ -75,7 +75,7 @@ export default function Carousel( carouselElement, carouselOptions ){
         orientation = direction === 'left' ? 'next' : 'prev',
         directionClass = direction === 'left' ? 'start' : 'end'
 
-    if ( element[carouselComponent] ){
+    if ( isAnimating && element[carouselComponent] ){
       isAnimating = false
 
       addClass( slides[next], activeClass )
@@ -135,8 +135,6 @@ export default function Carousel( carouselElement, carouselOptions ){
 
     const eventTarget = e.currentTarget || e.srcElement
 
-    if ( isAnimating ) return
-
     if ( controls[1] && eventTarget === controls[1] ) {
       self.next()
     } else if ( controls[1] && eventTarget === controls[0] ) {
@@ -146,7 +144,7 @@ export default function Carousel( carouselElement, carouselOptions ){
 
   function carouselKeyHandler({ which }) {
 
-    if ( isAnimating || !isElementInScrollRange( element ) ) return
+    if ( !isElementInScrollRange( element ) ) return
 
     switch ( which ) {
       case 39:
@@ -320,11 +318,11 @@ export default function Carousel( carouselElement, carouselOptions ){
   }
 
   CarouselProto.next = function() {
-    index++, self.to( index )
+    !isAnimating && index++, self.to( index )
   }
 
   CarouselProto.prev = function() {
-    index--, self.to( index )
+    !isAnimating && index--, self.to( index )
   }
 
   CarouselProto.to = function( next ) {