fix(carousel): fix reading of noTransition

- Check the correct DOM node for animation settings Closes #4325
angular-ui · Oct 3, 2015 · 2e26815 · 2e26815
1 parent 6f9f1fc
commit 2e26815
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/carousel/carousel.js b/src/carousel/carousel.js
@@ -357,8 +357,8 @@ function ($injector, $animate) {
   return {
     beforeAddClass: function(element, className, done) {
       // Due to transclusion, noTransition property is on parent's scope
-      if (className == 'active' && element.parent() &&
-          !element.parent().data(NO_TRANSITION)) {
+      if (className == 'active' && element.parent() && element.parent().parent() &&
+          !element.parent().parent().data(NO_TRANSITION)) {
         var stopped = false;
         var direction = element.data(SLIDE_DIRECTION);
         var directionClass = direction == 'next' ? 'left' : 'right';
@@ -387,8 +387,8 @@ function ($injector, $animate) {
     },
     beforeRemoveClass: function (element, className, done) {
       // Due to transclusion, noTransition property is on parent's scope
-      if (className === 'active' && element.parent() &&
-          !element.parent().data(NO_TRANSITION)) {
+      if (className === 'active' && element.parent() && element.parent().parent() &&
+          !element.parent().parent().data(NO_TRANSITION)) {
         var stopped = false;
         var direction = element.data(SLIDE_DIRECTION);
         var directionClass = direction == 'next' ? 'left' : 'right';