refactor(core): remove getters for packages/animations, language-service, platform-browser, router (#19151)

PR Close #19151
This commit is contained in:
Yuan Gao
2017-09-11 12:39:44 -07:00
committed by Igor Minar
parent 17eaef0311
commit 549f2254b4
13 changed files with 109 additions and 119 deletions

View File

@ -1305,7 +1305,7 @@ export class TransitionAnimationPlayer implements AnimationPlayer {
private _containsRealPlayer = false;
private _queuedCallbacks: {[name: string]: (() => any)[]} = {};
private _destroyed = false;
public readonly destroyed = false;
public parentPlayer: AnimationPlayer;
public markedForDestroy: boolean = false;
@ -1314,8 +1314,6 @@ export class TransitionAnimationPlayer implements AnimationPlayer {
get queued() { return this._containsRealPlayer == false; }
get destroyed() { return this._destroyed; }
setRealPlayer(player: AnimationPlayer) {
if (this._containsRealPlayer) return;
@ -1368,7 +1366,7 @@ export class TransitionAnimationPlayer implements AnimationPlayer {
finish(): void { this._player.finish(); }
destroy(): void {
this._destroyed = true;
(this as{destroyed: boolean}).destroyed = true;
this._player.destroy();
}

View File

@ -15,7 +15,6 @@ export class WebAnimationsPlayer implements AnimationPlayer {
private _onDoneFns: Function[] = [];
private _onStartFns: Function[] = [];
private _onDestroyFns: Function[] = [];
private _player: DOMAnimation;
private _duration: number;
private _delay: number;
private _initialized = false;
@ -23,6 +22,8 @@ export class WebAnimationsPlayer implements AnimationPlayer {
private _started = false;
private _destroyed = false;
private _finalKeyframe: {[key: string]: string | number};
public readonly domPlayer: DOMAnimation;
public time = 0;
public parentPlayer: AnimationPlayer|null = null;
@ -86,9 +87,10 @@ export class WebAnimationsPlayer implements AnimationPlayer {
}
}
this._player = this._triggerWebAnimation(this.element, keyframes, this.options);
(this as{domPlayer: DOMAnimation}).domPlayer =
this._triggerWebAnimation(this.element, keyframes, this.options);
this._finalKeyframe = keyframes.length ? keyframes[keyframes.length - 1] : {};
this._player.addEventListener('finish', () => this._onFinish());
this.domPlayer.addEventListener('finish', () => this._onFinish());
}
private _preparePlayerBeforeStart() {
@ -96,7 +98,7 @@ export class WebAnimationsPlayer implements AnimationPlayer {
if (this._delay) {
this._resetDomPlayerState();
} else {
this._player.pause();
this.domPlayer.pause();
}
}
@ -107,8 +109,6 @@ export class WebAnimationsPlayer implements AnimationPlayer {
return element['animate'](keyframes, options) as DOMAnimation;
}
get domPlayer() { return this._player; }
onStart(fn: () => void): void { this._onStartFns.push(fn); }
onDone(fn: () => void): void { this._onDoneFns.push(fn); }
@ -122,18 +122,18 @@ export class WebAnimationsPlayer implements AnimationPlayer {
this._onStartFns = [];
this._started = true;
}
this._player.play();
this.domPlayer.play();
}
pause(): void {
this.init();
this._player.pause();
this.domPlayer.pause();
}
finish(): void {
this.init();
this._onFinish();
this._player.finish();
this.domPlayer.finish();
}
reset(): void {
@ -144,8 +144,8 @@ export class WebAnimationsPlayer implements AnimationPlayer {
}
private _resetDomPlayerState() {
if (this._player) {
this._player.cancel();
if (this.domPlayer) {
this.domPlayer.cancel();
}
}
@ -166,9 +166,9 @@ export class WebAnimationsPlayer implements AnimationPlayer {
}
}
setPosition(p: number): void { this._player.currentTime = p * this.time; }
setPosition(p: number): void { this.domPlayer.currentTime = p * this.time; }
getPosition(): number { return this._player.currentTime / this.time; }
getPosition(): number { return this.domPlayer.currentTime / this.time; }
get totalTime(): number { return this._delay + this._duration; }