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

Merge pull request #3954 from NativeScript/animations-reset

Browse Source 
Fix animation's "Reset"
This commit is contained in:
Panayot Cankov
2017-04-07 10:55:13 +03:00
committed by GitHub
parent 70ae742f00 92d015b8d8
commit 7b33e9c896
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,7 @@ export class Animation extends AnimationBase {
constructor(animationDefinitions: Array<AnimationDefinitionInternal>, playSequentially?: boolean) { constructor(animationDefinitions: Array<AnimationDefinitionInternal>, playSequentially?: boolean) {
super(animationDefinitions, playSequentially); super(animationDefinitions, playSequentially);
this._valueSource = "animation";
if (animationDefinitions.length > 0 && animationDefinitions[0].valueSource !== undefined) { if (animationDefinitions.length > 0 && animationDefinitions[0].valueSource !== undefined) {
this._valueSource = animationDefinitions[0].valueSource; this._valueSource = animationDefinitions[0].valueSource;
} }
@ -275,7 +276,7 @@ export class Animation extends AnimationBase {
animator.addUpdateListener(new android.animation.ValueAnimator.AnimatorUpdateListener({ animator.addUpdateListener(new android.animation.ValueAnimator.AnimatorUpdateListener({
onAnimationUpdate(animator: android.animation.ValueAnimator) { onAnimationUpdate(animator: android.animation.ValueAnimator) {
let argb = (<java.lang.Integer>animator.getAnimatedValue()).intValue(); let argb = (<java.lang.Integer>animator.getAnimatedValue()).intValue();
propertyAnimation.target.style[backgroundColorProperty.cssName] = new Color(argb); propertyAnimation.target.style[setLocal ? backgroundColorProperty.name : backgroundColorProperty.keyframe] = new Color(argb);
} }
})); }));

1
tns-core-modules/ui/animation/animation.ios.ts
View File

@ -153,6 +153,7 @@ export class Animation extends AnimationBase {
constructor(animationDefinitions: Array<AnimationDefinitionInternal>, playSequentially?: boolean) { constructor(animationDefinitions: Array<AnimationDefinitionInternal>, playSequentially?: boolean) {
super(animationDefinitions, playSequentially); super(animationDefinitions, playSequentially);
this._valueSource = "animation";
if (animationDefinitions.length > 0 && animationDefinitions[0].valueSource !== undefined) { if (animationDefinitions.length > 0 && animationDefinitions[0].valueSource !== undefined) {
this._valueSource = animationDefinitions[0].valueSource; this._valueSource = animationDefinitions[0].valueSource;
} }

2
tns-core-modules/ui/core/view/view.android.ts
View File

@ -339,7 +339,7 @@ export class View extends ViewCommon {
return this.nativeView.getAlpha(); return this.nativeView.getAlpha();
} }
[opacityProperty.setNative](value: number) { [opacityProperty.setNative](value: number) {
this.nativeView.setAlpha(value); this.nativeView.setAlpha(float(value));
} }
[horizontalAlignmentProperty.getDefault](): HorizontalAlignment { [horizontalAlignmentProperty.getDefault](): HorizontalAlignment {