fix($animator): remove dependency on window.setTimeout.

2 files changed, 3 insertions, 10 deletions

diff --git a/src/Angular.js b/src/Angular.js
index a4ef8966..bf64c6c2 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -975,12 +975,13 @@ function bootstrap(element, modules) {
     }]);
     modules.unshift('ng');
     var injector = createInjector(modules);
-    injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector',
-       function(scope, element, compile, injector) {
+    injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector', '$animator',
+       function(scope, element, compile, injector, animator) {
         scope.$apply(function() {
           element.data('$injector', injector);
           compile(element)(scope);
         });
+        animator.enabled(true);
       }]
     );
     return injector;
diff --git a/src/ng/animator.js b/src/ng/animator.js
index 7f0f7b7a..d28ce158 100644
--- a/src/ng/animator.js
+++ b/src/ng/animator.js
@@ -130,14 +130,6 @@ var $AnimatorProvider = function() {
   this.$get = ['$animation', '$window', '$sniffer', '$rootElement', '$rootScope',
       function($animation, $window, $sniffer, $rootElement, $rootScope) {
     $rootElement.data(NG_ANIMATE_CONTROLLER, rootAnimateController);
-    var unregister = $rootScope.$watch(function() {
-      unregister();
-      if (rootAnimateController.running) {
-        $window.setTimeout(function() {
-          rootAnimateController.running = false;
-        }, 0);
-      }
-    });
 
     /**
      * @ngdoc function