cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(animations): make sure non-transitioned leave operations cancel existing animations (#15254)

Browse Source 
Closes #15213

PR Close #15254
This commit is contained in:
Matias Niemelä
2017-03-17 12:31:51 -07:00
committed by Miško Hevery
parent d0bc83ca27
commit a6fb78ee3c
2 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/animations/browser/src/render/dom_animation_engine.ts
View File

@ -28,7 +28,8 @@ export interface TriggerListenerTuple {
callback: (event: any) => any;
}
const MARKED_FOR_ANIMATION = 'ng-animate';
const MARKED_FOR_ANIMATION_CLASSNAME = 'ng-animating';
const MARKED_FOR_ANIMATION_SELECTOR = '.ng-animating';
const MARKED_FOR_REMOVAL = '$$ngRemove';
export class DomAnimationEngine {
@ -92,6 +93,7 @@ export class DomAnimationEngine {
element[MARKED_FOR_REMOVAL] = true;
this._queuedRemovals.set(element, () => {});
}
this._onRemovalTransition(element).forEach(player => player.destroy());
domFn();
}
@ -162,7 +164,7 @@ export class DomAnimationEngine {
// when a parent animation is set to trigger a removal we want to
// find all of the children that are currently animating and clear
// them out by destroying each of them.
const elms = element.querySelectorAll(MARKED_FOR_ANIMATION);
const elms = element.querySelectorAll(MARKED_FOR_ANIMATION_SELECTOR);
for (let i = 0; i < elms.length; i++) {
const elm = elms[i];
const activePlayers = this._activeElementAnimations.get(elm);
@ -300,8 +302,8 @@ export class DomAnimationEngine {
this._queuedTransitionAnimations.push(tuple);
player.init();
element.classList.add(MARKED_FOR_ANIMATION);
player.onDone(() => { element.classList.remove(MARKED_FOR_ANIMATION); });
element.classList.add(MARKED_FOR_ANIMATION_CLASSNAME);
player.onDone(() => { element.classList.remove(MARKED_FOR_ANIMATION_CLASSNAME); });
}
private _flushQueuedAnimations() {