kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-27 19:13:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix($animate): permit class-based animations for leave operations if ngAnimateChildren is enabled

Browse Source 
Prior to this fix, $animate.leave placed a disabled animation on the element
which prevented ngAnimateChildren from properly working. This patch now
addresses that issue.

Closes #8092
Closes #9491
This commit is contained in:
Matias Niemelä
2014-10-08 12:35:37 +03:00
committed by Igor Minar
parent d9ff4e42ce
commit df1a00b11a
2 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
test/ngAnimate/animateSpec.js
View File

@@ -4826,6 +4826,62 @@ describe("ngAnimate", function() {
expect(spy).toHaveBeenCalled();
expect(spy.callCount).toBe(1);
}));
it('should permit class-based animations when ng-animate-children is true for a structural animation', function() {
var spy = jasmine.createSpy();
module(function($animateProvider) {
$animateProvider.register('.inner', function() {
return {
beforeAddClass : function(element, className, done) {
spy();
done();
},
beforeRemoveClass : function(element, className, done) {
spy();
done();
}
};
});
});
inject(function($animate, $sniffer, $rootScope, $compile) {
$animate.enabled(true);
var html = '<div ng-animate-children>' +
' <div class="inner" ng-class="{animate:bool}">...</div>' +
'</div>';
var element = angular.element(html);
$compile(element)($rootScope);
var body = angular.element($document[0].body);
body.append($rootElement);
$rootScope.$watch('bool', function(bool) {
if (bool) {
$animate.enter(element, $rootElement);
} else if(element.parent().length) {
$animate.leave(element);
}
});
$rootScope.$digest();
expect(spy.callCount).toBe(0);
$rootScope.bool = true;
$rootScope.$digest();
$animate.triggerReflow();
$animate.triggerCallbacks();
expect(spy.callCount).toBe(1);
$rootScope.bool = false;
$rootScope.$digest();
$animate.triggerReflow();
$animate.triggerCallbacks();
expect(spy.callCount).toBe(2);
});
});
});
describe('SVG', function() {