terminal nodes added

Author: matsko

src/ngAnimate/animation.js

@@ -88,10 +88,13 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
           if (remainingLevelEntries <= 0) {
             remainingLevelEntries = nextLevelEntries;
             nextLevelEntries = 0;
-            result.push(row);
+            result = result.concat(row);
             row = [];
           }
-          row.push(entry.fn);
+          row.push({
+            fn: entry.fn,
+            terminal: entry.children.length === 0
+          });
           entry.children.forEach(function(childEntry) {
             nextLevelEntries++;
             queue.push(childEntry);
@@ -100,7 +103,7 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
         }
 
         if (row.length) {
-          result.push(row);
+          result = result.concat(row);
         }
 
         return result;
@@ -217,14 +220,12 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
         var anim = sortAnimations(toBeSortedAnimations);
         var finalLevel = anim.length - 1;
 
-        for (var i = 0; i < anim.length; i++) {
-          forEach(anim[i], function(startAnimationFn) {
-            if (i < finalLevel) {
-              $$forceReflow();
-            }
-            startAnimationFn();
-          });
-        }
+        forEach(anim, function(entry) {
+          if (!entry.terminal) {
+            $$forceReflow();
+          }
+          entry.fn();
+        });
       });
 
       return runner;

test/ngAnimate/integrationSpec.js

@@ -277,7 +277,7 @@ describe('ngAnimate integration tests', function() {
       });
     });
 
-    it('should issue a reflow for each parent class-based animation if one or more of them contain children with queued animations', function() {
+    it('should issue a reflow for each parent class-based animation that contains active child animations', function() {
       module('ngAnimateMock');
       inject(function($animate, $compile, $rootScope, $rootElement, $$rAF, $document) {
         element = jqLite(
@@ -287,7 +287,10 @@ describe('ngAnimate integration tests', function() {
           '<div ng-class="{two:exp}">' +
              '<div ng-if="exp"></div>' +
           '</div>' +
-          '<div ng-class="{three:exp}"></div>'
+          '<div ng-class="{three:exp}">' +
+             '<div ng-if="false"></div>' +
+          '</div>' +
+          '<div ng-class="{four:exp}"></div>'
         );
 
         $rootElement.append(element);
@@ -299,7 +302,7 @@ describe('ngAnimate integration tests', function() {
 
         $rootScope.exp = true;
         $rootScope.$digest();
-        expect($animate.reflows).toBe(3);
+        expect($animate.reflows).toBe(2);
       });
     });