javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(animations): check if target is present before removing its animation (#4586)

Browse Source 
In Angular, if the NativeScriptAnimationModule is imported in another
NgModule more than once (which shouldn't be done), the renderer is instantiated twice. This
causes animation with empty targets to be created. If such animation is
removed, the app will crash. Additional check if the target is present
will prevent this.
This commit is contained in:
Stanimira Vlaeva
2017-07-25 10:28:09 +03:00
committed by Alexander Vakrilov
parent 1f9a64e908
commit 4bd3a94873
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tns-core-modules/ui/animation/animation.android.ts
View File

@ -192,14 +192,20 @@ export class Animation extends AnimationBase {
this._propertyUpdateCallbacks.forEach(v => v());
this._disableHardwareAcceleration();
this._resolveAnimationFinishedPromise();
this._target._removeAnimation(this);
if (this._target) {
this._target._removeAnimation(this);
}
}
private _onAndroidAnimationCancel() { // tslint:disable-line
this._propertyResetCallbacks.forEach(v => v());
this._disableHardwareAcceleration();
this._rejectAnimationFinishedPromise();
this._target._removeAnimation(this);
if (this._target) {
this._target._removeAnimation(this);
}
}
private _createAnimators(propertyAnimation: PropertyAnimation): void {
@ -482,4 +488,4 @@ export class Animation extends AnimationBase {
}
}
}
}
}