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

Revert "fix(animations): make sure @.disabled works in non-animation components"

Browse Source 
This reverts commit 01a2688848.
This commit is contained in:
Alex Rickabaugh
2017-07-14 11:00:29 -07:00
parent 01a2688848
commit f7686d4124
3 changed files with 22 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/platform-browser/animations/src/animation_renderer.ts
View File

@ -9,9 +9,6 @@ import {AnimationTriggerMetadata} from '@angular/animations';
import {ɵAnimationEngine as AnimationEngine} from '@angular/animations/browser';
import {Injectable, NgZone, Renderer2, RendererFactory2, RendererStyleFlags2, RendererType2} from '@angular/core';
const ANIMATION_PREFIX = '@';
const DISABLE_ANIMATIONS_FLAG = '@.disabled';
@Injectable()
export class AnimationRendererFactory implements RendererFactory2 {
private _currentId: number = 0;
@ -169,11 +166,7 @@ export class BaseAnimationRenderer implements Renderer2 {
}
setProperty(el: any, name: string, value: any): void {
if (name.charAt(0) == ANIMATION_PREFIX && name == DISABLE_ANIMATIONS_FLAG) {
this.disableAnimations(el, !!value);
} else {
this.delegate.setProperty(el, name, value);
}
this.delegate.setProperty(el, name, value);
}
setValue(node: any, value: string): void { this.delegate.setValue(node, value); }
@ -181,10 +174,6 @@ export class BaseAnimationRenderer implements Renderer2 {
listen(target: any, eventName: string, callback: (event: any) => boolean | void): () => void {
return this.delegate.listen(target, eventName, callback);
}
protected disableAnimations(element: any, value: boolean) {
this.engine.disableAnimations(element, value);
}
}
export class AnimationRenderer extends BaseAnimationRenderer implements Renderer2 {
@ -196,12 +185,9 @@ export class AnimationRenderer extends BaseAnimationRenderer implements Renderer
}
setProperty(el: any, name: string, value: any): void {
if (name.charAt(0) == ANIMATION_PREFIX) {
if (name.charAt(1) == '.' && name == DISABLE_ANIMATIONS_FLAG) {
this.disableAnimations(el, !!value);
} else {
this.engine.process(this.namespaceId, el, name.substr(1), value);
}
if (name.charAt(0) == '@') {
name = name.substr(1);
this.engine.process(this.namespaceId, el, name, value);
} else {
this.delegate.setProperty(el, name, value);
}
@ -209,13 +195,11 @@ export class AnimationRenderer extends BaseAnimationRenderer implements Renderer
listen(target: 'window'|'document'|'body'|any, eventName: string, callback: (event: any) => any):
() => void {
if (eventName.charAt(0) == ANIMATION_PREFIX) {
if (eventName.charAt(0) == '@') {
const element = resolveElementFromTarget(target);
let name = eventName.substr(1);
let phase = '';
// @listener.phase is for trigger animation callbacks
// @@listener is for animation builder callbacks
if (name.charAt(0) != ANIMATION_PREFIX) {
if (name.charAt(0) != '@') { // transition-specific
[name, phase] = parseTriggerCallbackName(name);
}
return this.engine.listen(this.namespaceId, element, name, phase, event => {