javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: There is a crash in Android when running animations too fast

Browse Source
This commit is contained in:
Tsvetan Raikov
2016-04-18 13:42:42 +03:00
parent 4a093136a4
commit 3b11d5d10e
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ui/animation/keyframe-animation.ts
View File

@ -35,7 +35,7 @@ export class KeyframeAnimation {
private _reject; private _reject;
private _isPlaying: boolean; private _isPlaying: boolean;
private _isForwards: boolean; private _isForwards: boolean;
private _currentAnimation: animationModule.Animation; private _nativeAnimations: Array<animationModule.Animation>;
public static keyframeAnimationFromInfo(info: KeyframeAnimationInfo, valueSourceModifier: number) { public static keyframeAnimationFromInfo(info: KeyframeAnimationInfo, valueSourceModifier: number) {
let animations = new Array<Object>(); let animations = new Array<Object>();
@ -102,10 +102,11 @@ export class KeyframeAnimation {
public cancel() { public cancel() {
if (this._isPlaying) { if (this._isPlaying) {
if (this._currentAnimation && this._currentAnimation.isPlaying) {
this._currentAnimation.cancel();
}
this._isPlaying = false; this._isPlaying = false;
for (let i = this._nativeAnimations.length - 1; i >= 0; i--) {
let animation = this._nativeAnimations[i];
animation.cancel();
}
this._rejectAnimationFinishedPromise(); this._rejectAnimationFinishedPromise();
} }
} }
@ -121,6 +122,7 @@ export class KeyframeAnimation {
}); });
this._isPlaying = true; this._isPlaying = true;
this._nativeAnimations = new Array<animationModule.Animation>();
if (this.delay !== 0) { if (this.delay !== 0) {
let that = this; let that = this;
@ -134,6 +136,9 @@ export class KeyframeAnimation {
} }
private animate(view: view.View, index: number, iterations: number) { private animate(view: view.View, index: number, iterations: number) {
if (!this._isPlaying) {
return;
}
if (index === 0) { if (index === 0) {
let animation = this.animations[0]; let animation = this.animations[0];
let modifier = animation["valueSource"]; let modifier = animation["valueSource"];
@ -196,19 +201,19 @@ export class KeyframeAnimation {
animation.play().then(() => { animation.play().then(() => {
this.animate(view, index + 1, iterations); this.animate(view, index + 1, iterations);
}); });
this._currentAnimation = animation; this._nativeAnimations.push(animation);
} }
} }
public _resolveAnimationFinishedPromise() { public _resolveAnimationFinishedPromise() {
this._nativeAnimations = new Array<animationModule.Animation>();
this._isPlaying = false; this._isPlaying = false;
this._currentAnimation = undefined;
this._resolve(); this._resolve();
} }
public _rejectAnimationFinishedPromise() { public _rejectAnimationFinishedPromise() {
this._nativeAnimations = new Array<animationModule.Animation>();
this._isPlaying = false; this._isPlaying = false;
this._currentAnimation = undefined;
this._reject(new Error("Animation cancelled.")); this._reject(new Error("Animation cancelled."));
} }
} }