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

Fixed: Visual states not working properly when the animation is canceled in Android

Browse Source
This commit is contained in:
Tsvetan Raikov
2016-04-07 18:58:55 +03:00
parent 19acc86e26
commit c07fc07348
7 changed files with 145 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ui/styling/css-selector.ts
View File

@@ -90,9 +90,12 @@ export class CssSelector {
});
if (this.animations && view.isLoaded) {
for (let animationInfo of this.animations) {
let realAnimation = keyframeAnimation.KeyframeAnimation.keyframeAnimationFromInfo(animationInfo, modifier);
if (realAnimation) {
realAnimation.play(view);
let animation = keyframeAnimation.KeyframeAnimation.keyframeAnimationFromInfo(animationInfo, modifier);
if (animation) {
view._registerAnimation(animation);
animation.play(view)
.then(() => { view._unregisterAnimation(animation); })
.catch((e) => { view._unregisterAnimation(animation); });
}
}
}

2
ui/styling/visual-state.ts
View File

@@ -83,6 +83,8 @@ function resetProperties(view: viewModule.View, oldState: VisualState, newState:
}
}
view._unregisterAllAnimations();
for (let selector of oldState.animatedSelectors) {
for (let animationInfo of selector.animations) {
for (let keyframe of animationInfo.keyframes) {