From 15389b0e377e2a84b85178e993e4940d8098d0ed Mon Sep 17 00:00:00 2001
From: Matias Niemelä
Date: Mon, 22 Jul 2013 15:37:45 -0400
Subject: fix(ngAnimate): $timeout integration and cancel callbacks added

---
 src/ng/animate.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/ng')

diff --git a/src/ng/animate.js b/src/ng/animate.js
index 206a4b03..7927b12f 100644
--- a/src/ng/animate.js
+++ b/src/ng/animate.js
@@ -56,7 +56,7 @@ var $AnimateProvider = ['$provide', function($provide) {
     $provide.factory(name, factory);
   };
 
-  this.$get = function() {
+  this.$get = ['$timeout', function($timeout) {
     return {
       enter : function(element, parent, after, done) {
         var afterNode = after && after[after.length - 1];
@@ -66,12 +66,12 @@ var $AnimateProvider = ['$provide', function($provide) {
         forEach(element, function(node) {
           parentNode.insertBefore(node, afterNextSibling);
         });
-        (done || noop)();
+        $timeout(done || noop, 0, false);
       },
 
       leave : function(element, done) {
         element.remove();
-        (done || noop)();
+        $timeout(done || noop, 0, false);
       },
 
       move : function(element, parent, after, done) {
@@ -85,7 +85,7 @@ var $AnimateProvider = ['$provide', function($provide) {
                       className :
                       isArray(className) ? className.join(' ') : '';
         element.addClass(className);
-        (done || noop)();
+        $timeout(done || noop, 0, false);
       },
 
       removeClass : function(element, className, done) {
@@ -93,10 +93,10 @@ var $AnimateProvider = ['$provide', function($provide) {
                       className :
                       isArray(className) ? className.join(' ') : '';
         element.removeClass(className);
-        (done || noop)();
+        $timeout(done || noop, 0, false);
       },
 
       enabled : noop
     };
-  };
+  }];
 }];
-- 
cgit v1.2.3