wip

Author: matsko

src/ngAnimate/animateCss.js

@@ -196,13 +196,13 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
       return stagger;
     }
 
-    var cancelLastRefRequest, bod = $document[0].body;
+    var cancelLastRAFRequest, bod = $document[0].body;
     function waitUntilQuiet(callback) {
-      if (cancelLastRafRequest) {
-        cancelLastRafRequest(); //cancels the request
+      if (cancelLastRAFRequest) {
+        cancelLastRAFRequest(); //cancels the request
       }
-      cancelLastRafRequest = $$rAF(function() {
-        cancelLastRequest = null;
+      cancelLastRAFRequest = $$rAF(function() {
+        cancelLastRAFRequest = null;
         gcsLookup.flush();
         gcsStaggerLookup.flush();
 
@@ -247,6 +247,7 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
       var animationPaused;
       var animationCompleted;
       var runner;
+      var runnerHost;
 
       if (options.duration === 0 || (!$sniffer.animations && !$sniffer.transitions)) {
         close();
@@ -443,13 +444,15 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
         start: function() {
           if (animationClosed) return;
 
-          runner = new $animateRunner({
+          runnerHost = {
             end: endFn,
             cancel: cancelFn
-          });
+          };
+
+          runner = new $animateRunner(runnerHost);
 
           waitUntilQuiet(function() {
-            start(deferred);
+            start();
           });
 
           // we don't have access to pause/resume the animation
@@ -554,16 +557,13 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
         }
 
         // this will decorate the existing promise runner with pause/resume methods
-        $$animateRunner(deferred.promise, {
-          resume: function() {
-            playPause(true);
-          },
-          pause: function() {
-            playPause(false);
-          }
-        });
+        runnerHost.resume = function() {
+          playPause(true);
+        };
 
-        return deferred.promise;
+        runnerHost.pause = function() {
+          playPause(false);
+        };
 
         function triggerAnimationStart() {
           // just incase a stagger animation kicks in when the animation

test/ngAnimate/animateCssSpec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-describe("ngAnimate $animateCss", function() {
+ddescribe("ngAnimate $animateCss", function() {
 
   beforeEach(module('ngAnimate'));
 
@@ -50,7 +50,7 @@ describe("ngAnimate $animateCss", function() {
 
   describe("rAF usage", function() {
     it("should buffer all requests into a single requestAnimationFrame call",
-      inject(function($animateCss, $$rAF, $document, $rootElement) {
+      inject(function($animateCss, $$rAF, $rootScope, $document, $rootElement) {
 
       angular.element($document[0].body).append($rootElement);
 
@@ -76,6 +76,8 @@ describe("ngAnimate $animateCss", function() {
       forEach(runners, function(runner) {
         runner.end();
       });
+
+      $rootScope.$digest();
       expect(count).toBe(3);
     }));
 
@@ -188,7 +190,9 @@ describe("ngAnimate $animateCss", function() {
       expect(element).not.toHaveClass('ng-enter-active');
     }));
 
-    it('should return a runner object at the start of the animation that is an extension of a promise', inject(function() {
+    iit('should return a runner object at the start of the animation that contains a `then` method',
+      inject(function($rootScope) {
+
       var runner = animator.start();
       triggerAnimationStartFrame();
 
@@ -200,6 +204,7 @@ describe("ngAnimate $animateCss", function() {
       });
 
       runner.end();
+      $rootScope.$digest();
       expect(resolved).toBeTruthy();
     }));