javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #588 from genexliu/feature/fix_issue_587

Browse Source 
fix the issue that an iOS animation promise may never be resolved nor rejected
This commit is contained in:
Rossen Hristov
2015-08-18 11:22:54 +03:00
parent 84d43407cb 72e490a036
commit c9a605908c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/animation/animation.ios.ts
View File

@@ -96,7 +96,7 @@ export class Animation extends common.Animation implements definition.Animation
that._finishedAnimations++;
}
if (that._cancelledAnimations === that._mergedPropertyAnimations.length) {
if (that._cancelledAnimations > 0 && (that._cancelledAnimations + that._finishedAnimations) === that._mergedPropertyAnimations.length) {
trace.write(that._cancelledAnimations + " animations cancelled.", trace.categories.Animation);
that._rejectAnimationFinishedPromise();
}