fix($animator): avoid completing the animation asynchronously unless CSS transtiions/animations are present

Closes #4023
Closes #3940

2 files changed, 1 insertions, 3 deletions

diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js
index 44b94563..7fcdef73 100644
--- a/src/ngAnimate/animate.js
+++ b/src/ngAnimate/animate.js
@@ -481,7 +481,7 @@ angular.module('ngAnimate', ['ng'])
           //avoid calling done() since there is no need to remove any
           //data or className values since this happens earlier than that
           //and also use a timeout so that it won't be asynchronous
-          $timeout(onComplete || noop, 0, false);
+          onComplete && onComplete();
           return;
         }
 
diff --git a/test/ngAnimate/animateSpec.js b/test/ngAnimate/animateSpec.js
index 81d84f96..f5faa024 100644
--- a/test/ngAnimate/animateSpec.js
+++ b/test/ngAnimate/animateSpec.js
@@ -503,7 +503,6 @@ describe("ngAnimate", function() {
           element.addClass('ng-hide');
           expect(element).toBeHidden();
           $animate.removeClass(element, 'ng-hide');
-          $timeout.flush();
           expect(element).toBeShown();
         }));
 
@@ -554,7 +553,6 @@ describe("ngAnimate", function() {
           element.addClass('ng-hide');
           expect(element).toBeHidden();
           $animate.removeClass(element, 'ng-hide');
-          $timeout.flush();
           expect(element).toBeShown();
 
           $animate.enabled(true);