' +
@@ -350,6 +352,76 @@ describe('ngAnimate integration tests', function() {
});
});
+ it('should avoid adding the ng-enter-prepare method to a parent structural animation that contains child animations', function() {
+ module('ngAnimateMock');
+ inject(function($animate, $compile, $rootScope, $rootElement, $document, $$rAF) {
+ element = jqLite(
+ '
'
+ );
+
+ ss.addRule('.ng-enter', 'transition:2s linear all;');
+
+ $rootElement.append(element);
+ jqLite($document[0].body).append($rootElement);
+
+ $compile(element)($rootScope);
+ $rootScope.parent = true;
+ $rootScope.child = true;
+ $rootScope.$digest();
+
+ var parent = jqLite(element[0].querySelector('.parent'));
+ var child = jqLite(element[0].querySelector('.child'));
+
+ expect(parent).not.toHaveClass('ng-enter-prepare');
+ expect(child).toHaveClass('ng-enter-prepare');
+
+ $$rAF.flush();
+
+ expect(parent).not.toHaveClass('ng-enter-prepare');
+ expect(child).not.toHaveClass('ng-enter-prepare');
+ });
+ });
+
+ it('should add the preparation class for an enter animation before a parent class-based animation is applied', function() {
+ module('ngAnimateMock');
+ inject(function($animate, $compile, $rootScope, $rootElement, $document) {
+ element = jqLite(
+ '
'
+ );
+
+ ss.addRule('.ng-enter', 'transition:2s linear all;');
+ ss.addRule('.parent-add', 'transition:5s linear all;');
+
+ $rootElement.append(element);
+ jqLite($document[0].body).append($rootElement);
+
+ $compile(element)($rootScope);
+ $rootScope.exp = true;
+ $rootScope.$digest();
+
+ var parent = element;
+ var child = element.find('div');
+
+ expect(parent).not.toHaveClass('parent');
+ expect(parent).toHaveClass('parent-add');
+ expect(child).not.toHaveClass('ng-enter');
+ expect(child).toHaveClass('ng-enter-prepare');
+
+ $animate.flush();
+ expect(parent).toHaveClass('parent parent-add parent-add-active');
+ expect(child).toHaveClass('ng-enter ng-enter-active');
+ expect(child).not.toHaveClass('ng-enter-prepare');
+ });
+ });
it('should pack level elements into their own RAF flush', function() {
module('ngAnimateMock');
@@ -499,6 +571,45 @@ describe('ngAnimate integration tests', function() {
expect(child).not.toHaveClass('blue');
});
});
+
+ it('should cache invalid animations to avoid application of ngAnimate CSS classes', function() {
+ function fill(max) {
+ var arr = [];
+ for (var i = 0; i < max; i++) {
+ arr.push(i);
+ }
+ return arr;
+ }
+
+ inject(function($animate, $rootScope, $compile, $timeout, $$rAF, $$jqLite) {
+ ss.addRule('.animate-me', 'transition: all 0.5s;');
+
+ var classAddSpy = spyOn($$jqLite, 'addClass');
+ var classRemoveSpy = spyOn($$jqLite, 'removeClass');
+
+ element = jqLite(
+ '
'
+ );
+
+ html(element);
+ $compile(element)($rootScope);
+
+ $rootScope.items = fill(100);
+ $rootScope.$digest();
+
+ expect(classAddSpy.callCount).toBe(2);
+ expect(classRemoveSpy.callCount).toBe(2);
+
+ expect(classAddSpy.calls[0].args[1]).toBe('ng-animate');
+ expect(classAddSpy.calls[1].args[1]).toBe('ng-enter');
+ expect(classRemoveSpy.calls[0].args[1]).toBe('ng-enter');
+ expect(classRemoveSpy.calls[1].args[1]).toBe('ng-animate');
+
+ expect(element.children().length).toBe(100);
+ });
+ });
});
describe('JS animations', function() {