Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(animations): allow players to be destroyed before initialized #13346

Merged
merged 1 commit into from Dec 15, 2016
Merged

fix(animations): allow players to be destroyed before initialized #13346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion modules/@angular/platform-browser/src/dom/web_animations_player.ts
View file
Open in desktop
Expand Up @@ -124,7 +124,11 @@ export class WebAnimationsPlayer implements AnimationPlayer {
this._started = false;
}

private _resetDomPlayerState() { this._player.cancel(); }
private _resetDomPlayerState() {
if (this._player) {
this._player.cancel();
}
}

restart(): void {
this.reset();
Expand Down
6 changes: 6 additions & 0 deletions modules/@angular/platform-browser/test/dom/web_animations_player_spec.ts
View file
Open in desktop
Expand Up @@ -175,6 +175,12 @@ export function main() {
expect(data['keyframes']).toEqual([{opacity: '0.5'}, {opacity: '1'}]);
});

it('should allow the player to be destroyed before it is initialized', () => {
const elm = el('<div></div>');
const player = new ExtendedWebAnimationsPlayer(elm, [], {});
expect(() => { player.destroy(); }).not.toThrowError();
});

describe('previousStyle', () => {
it('should merge keyframe styles based on the previous styles passed in when the player has finished its operation',
() => {
Expand Down