fix($animate): ensure class-based animations are always skipped before structural post-digest tasks are run

Closes #5582
This commit is contained in:
Matias Niemelä
2014-01-02 12:01:46 -05:00
parent 162144202c
commit bc492c0fc1
2 changed files with 27 additions and 1 deletions

View File

@@ -610,9 +610,14 @@ angular.module('ngAnimate', ['ng'])
}
var animations = [];
//only add animations if the currently running animation is not structural
//or if there is no animation running at all
if(!ngAnimateState.running || !(isClassBased && ngAnimateState.structural)) {
var allowAnimations = isClassBased ?
!ngAnimateState.disabled && (!ngAnimateState.running || !ngAnimateState.structural) :
true;
if(allowAnimations) {
forEach(matches, function(animation) {
//add the animation to the queue to if it is allowed to be cancelled
if(!animation.allowCancel || animation.allowCancel(element, animationEvent, className)) {