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

Fixed: _resolveAnimationCurve is undefined

Browse Source
This commit is contained in:
Tsvetan Raikov
2016-02-03 16:08:03 +02:00
parent a8aaeac137
commit f403b506aa
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,21 +136,6 @@ export class Animation extends common.Animation implements definition.Animation
this._iOSAnimationFunction = Animation._createiOSAnimationFunction(this._mergedPropertyAnimations, 0, this._playSequentially, animationFinishedCallback, this); this._iOSAnimationFunction = Animation._createiOSAnimationFunction(this._mergedPropertyAnimations, 0, this._playSequentially, animationFinishedCallback, this);
} }
_resolveAnimationCurve(curve: any): any {
switch (curve) {
case enums.AnimationCurve.easeIn:
return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseIn);
case enums.AnimationCurve.easeOut:
return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseOut);
case enums.AnimationCurve.easeInOut:
return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseInEaseOut);
case enums.AnimationCurve.linear:
return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionLinear);
default:
return undefined;
}
}
private static _createiOSAnimationFunction(propertyAnimations: Array<common.PropertyAnimation>, index: number, playSequentially: boolean, finishedCallback: (cancelled?: boolean) => void, that:Animation): Function { private static _createiOSAnimationFunction(propertyAnimations: Array<common.PropertyAnimation>, index: number, playSequentially: boolean, finishedCallback: (cancelled?: boolean) => void, that:Animation): Function {
return (cancelled?: boolean) => { return (cancelled?: boolean) => {
if (cancelled && finishedCallback) { if (cancelled && finishedCallback) {
@ -350,6 +335,21 @@ export class Animation extends common.Animation implements definition.Animation
} }
} }
export function _resolveAnimationCurve(curve: any): any {
switch (curve) {
case enums.AnimationCurve.easeIn:
return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseIn);
case enums.AnimationCurve.easeOut:
return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseOut);
case enums.AnimationCurve.easeInOut:
return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseInEaseOut);
case enums.AnimationCurve.linear:
return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionLinear);
default:
return undefined;
}
}
export function _getTransformMismatchErrorMessage(view: viewModule.View): string { export function _getTransformMismatchErrorMessage(view: viewModule.View): string {
// Order is important: translate, rotate, scale // Order is important: translate, rotate, scale
var result: CGAffineTransform = CGAffineTransformIdentity; var result: CGAffineTransform = CGAffineTransformIdentity;