From 129e2e021ab1d773874428cd1fb329eae72797c4 Mon Sep 17 00:00:00 2001
From: Tomer Chachamu
Date: Tue, 4 Mar 2014 15:29:11 +0000
Subject: fix(ngAnimate): setting classNameFilter disables animation inside
 ng-if

Closes #6539
---
 src/ngAnimate/animate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js
index 447dfa3a..542b678f 100644
--- a/src/ngAnimate/animate.js
+++ b/src/ngAnimate/animate.js
@@ -770,7 +770,7 @@ angular.module('ngAnimate', ['ng'])
           fireDOMOperation();
           fireBeforeCallbackAsync();
           fireAfterCallbackAsync();
-          fireDoneCallbackAsync();
+          closeAnimation();
           return;
         }
 
@@ -949,7 +949,7 @@ angular.module('ngAnimate', ['ng'])
                  animation, but class-based animations don't. An example of this
                  failing would be when a parent HTML tag has a ng-class attribute
                  causing ALL directives below to skip animations during the digest */
-              if(runner.isClassBased) {
+              if(runner && runner.isClassBased) {
                 cleanup(element, className);
               } else {
                 $$asyncCallback(function() {
-- 
cgit v1.2.3