fix(carousel): fix conditions for animation

- Fix incorrect animation conditions Closes #4974 Fixes #4972
angular-ui · Nov 28, 2015 · 12a37e0 · 12a37e0
1 parent d8c8767
commit 12a37e0
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/carousel/carousel.js b/src/carousel/carousel.js
@@ -190,9 +190,8 @@ angular.module('ui.bootstrap.carousel', [])
   };
 
   $scope.$watch('noTransition', function(noTransition) {
-    $animate.enabled($element, noTransition);
+    $animate.enabled($element, !noTransition);
   });
-
 }])
 
 .directive('uibCarousel', function() {
@@ -255,8 +254,7 @@ function($animate, $animateCss) {
 
   return {
     beforeAddClass: function(element, className, done) {
-      // Due to transclusion, noTransition property is on parent's scope
-      if (className === 'active' && !$animate.enabled(element)) {
+      if (className === 'active' && $animate.enabled(element)) {
         var stopped = false;
         var direction = element.data(SLIDE_DIRECTION);
         var directionClass = direction === 'next' ? 'left' : 'right';
@@ -275,8 +273,7 @@ function($animate, $animateCss) {
       done();
     },
     beforeRemoveClass: function (element, className, done) {
-      // Due to transclusion, noTransition property is on parent's scope
-      if (className === 'active' && !$animate.enabled(element)) {
+      if (className === 'active' && $animate.enabled(element)) {
         var stopped = false;
         var direction = element.data(SLIDE_DIRECTION);
         var directionClass = direction === 'next' ? 'left' : 'right';