refactor($animate): use $animate.$$setClassImmediately to save code

Author: matsko

src/ng/animate.js

@@ -100,15 +100,15 @@ var $AnimateProvider = ['$provide', function($provide) {
       return defer.promise;
     }
 
-    function resolveElementClasses(element, cache) {
+    function resolveElementClasses(element, classes) {
       var toAdd = [], toRemove = [];
 
       var hasClasses = createMap();
       forEach((element.attr('class') || '').split(/\s+/), function(className) {
         hasClasses[className] = true;
       });
 
-      forEach(cache.classes, function(status, className) {
+      forEach(classes, function(status, className) {
         var hasClass = hasClasses[className];
 
         // If the most recent class manipulation (via $animate) was to remove the class, and the
@@ -288,20 +288,12 @@ var $AnimateProvider = ['$provide', function($provide) {
        * @param {string} remove the CSS class which will be removed from the element
        * @return {Promise} the animation callback promise
        */
-      setClass : function(element, add, remove, runSynchronously) {
+      setClass : function(element, add, remove) {
         var self = this;
         var STORAGE_KEY = '$$animateClasses';
         var createdCache = false;
         element = jqLite(element);
 
-        if (runSynchronously) {
-          // TODO(@caitp/@matsko): Remove undocumented `runSynchronously` parameter, and always
-          // perform DOM manipulation asynchronously or in postDigest.
-          self.$$addClassImmediately(element, add);
-          self.$$removeClassImmediately(element, remove);
-          return asyncPromise();
-        }
-
         var cache = element.data(STORAGE_KEY);
         if (!cache) {
           cache = {
@@ -322,11 +314,14 @@ var $AnimateProvider = ['$provide', function($provide) {
             var cache = element.data(STORAGE_KEY);
             element.removeData(STORAGE_KEY);
 
-            var classes = cache && resolveElementClasses(element, cache);
-
-            if (classes) {
-              if (classes[0]) self.$$addClassImmediately(element, classes[0]);
-              if (classes[1]) self.$$removeClassImmediately(element, classes[1]);
+            // in the event that the element is removed before postDigest
+            // is run then the cache will be undefined and there will be
+            // no need anymore to add or remove and of the element classes
+            if (cache) {
+              var classes = resolveElementClasses(element, cache.classes);
+              if (classes) {
+                self.$$setClassImmediately(element, classes[0], classes[1]);
+              }
             }
 
             done();
@@ -337,6 +332,12 @@ var $AnimateProvider = ['$provide', function($provide) {
         return cache.promise;
       },
 
+      $$setClassImmediately : function(element, add, remove) {
+        add && this.$$addClassImmediately(element, add);
+        remove && this.$$removeClassImmediately(element, remove);
+        return asyncPromise();
+      },
+
       enabled : noop,
       cancel : noop
     };

src/ngAnimate/animate.js

@@ -1000,7 +1000,7 @@ angular.module('ngAnimate', ['ng'])
             // TODO(@caitp/@matsko): Don't use private/undocumented API here --- we should not be
             // changing the DOM synchronously in this case. The `true` parameter must eventually be
             // removed.
-            return $delegate.setClass(element, add, remove, true);
+            return $delegate.$$setClassImmediately(element, add, remove);
           }
 
           // we're using a combined array for both the add and remove