diff --git a/src/responsive-carousel.drag.js b/src/responsive-carousel.drag.js index 56f5d5f..32bb58e 100644 --- a/src/responsive-carousel.drag.js +++ b/src/responsive-carousel.drag.js @@ -75,7 +75,7 @@ // add the fast transition class to make transitions out of a drag quick // remove any no-transition class so the transition out of the drag can work $both - .addClass("fast") + .addClass("fast-transition") .removeClass("no-transition"); if( $( e.target ).attr( "data-transition" ) === "slide" ){ @@ -93,7 +93,7 @@ $( e.target ).trigger( "goto." + pluginName, newSlide ? $next : $current ); // remove the fast transition class so that other transitions can be slow - $both.removeClass("fast"); + $both.removeClass("fast-transition"); // do the post transition cleanup to make sure that the state in the // component is sane for future transitions and navigation diff --git a/src/responsive-carousel.slide.css b/src/responsive-carousel.slide.css index 8147af7..319e97c 100644 --- a/src/responsive-carousel.slide.css +++ b/src/responsive-carousel.slide.css @@ -63,5 +63,13 @@ left: 0; } .carousel-item.no-transition { - transition: none !important; -} \ No newline at end of file + transition: none !important; +} +.carousel-slide .carousel-item.fast-transition, +.carousel-slide-reverse .carousel-item.fast-transition { + -webkit-transition: left .1s ease; + -moz-transition: left .1s ease; + -ms-transition: left .1s ease; + -o-transition: left .1s ease; + transition: left .1s ease; +} diff --git a/test/functional/slide-two.html b/test/functional/slide-two.html index e407997..b8930f7 100644 --- a/test/functional/slide-two.html +++ b/test/functional/slide-two.html @@ -32,14 +32,6 @@ transition: left 2s ease; } - .carousel-item.fast { - -webkit-transition: left .1s ease; - -moz-transition: left .1s ease; - -ms-transition: left .1s ease; - -o-transition: left .1s ease; - transition: left .1s ease; - } - .carousel-slide-reverse .carousel-item { -webkit-transition: left 2s ease; -moz-transition: left 2s ease;