fix(ngAnimate): remove event prepare class when skipping animation

angular · Aug 30, 2018 · 0761de2 · 0761de2
1 parent a553735
commit 0761de2
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/ngAnimate/animation.js b/src/ngAnimate/animation.js
@@ -187,7 +187,7 @@ var $$AnimationProvider = ['$animateProvider', /** @this */ function($animatePro
           var element = animationEntry.from ? animationEntry.from.element : animationEntry.element;
           var extraClasses = options.addClass;
           extraClasses = (extraClasses ? (extraClasses + ' ') : '') + NG_ANIMATE_CLASSNAME;
-          var cacheKey = $$animateCache.cacheKey(node, event, extraClasses, options.removeClass);
+          var cacheKey = $$animateCache.cacheKey(node, animationEntry.event, extraClasses, options.removeClass);
 
           toBeSortedAnimations.push({
             element: element,
@@ -199,6 +199,7 @@ var $$AnimationProvider = ['$animateProvider', /** @this */ function($animatePro
               // and it's in fact an invalid animation (something that has duration = 0)
               // then we should skip all the heavy work from here on
               if ($$animateCache.containsCachedAnimationWithoutDuration(cacheKey)) {
+                removePrepareClass();
                 closeFn();
                 return;
               }
@@ -399,17 +400,21 @@ var $$AnimationProvider = ['$animateProvider', /** @this */ function($animatePro
         }
       }
 
-      function beforeStart() {
-        tempClasses = (tempClasses ? (tempClasses + ' ') : '') + NG_ANIMATE_CLASSNAME;
-        $$jqLite.addClass(element, tempClasses);
-
+      function removePrepareClass() {
         var prepareClassName = element.data(PREPARE_CLASSES_KEY);
         if (prepareClassName) {
           $$jqLite.removeClass(element, prepareClassName);
           prepareClassName = null;
         }
       }
 
+      function beforeStart() {
+        tempClasses = (tempClasses ? (tempClasses + ' ') : '') + NG_ANIMATE_CLASSNAME;
+        $$jqLite.addClass(element, tempClasses);
+
+        removePrepareClass();
+      }
+
       function updateAnimationRunners(animation, newRunner) {
         if (animation.from && animation.to) {
           update(animation.from.element);