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 broken unit tests because of the animation refactoring

Browse Source
This commit is contained in:
Tsvetan Raikov
2016-02-03 10:55:02 +02:00
parent 68f9358b1d
commit a0020453e5
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,7 @@ export class Animation extends common.Animation implements definition.Animation
case common.Properties.backgroundColor: case common.Properties.backgroundColor:
(<any>animation)._originalValue = animation.target.backgroundColor; (<any>animation)._originalValue = animation.target.backgroundColor;
(<any>animation)._propertyResetCallback = (value) => { animation.target.backgroundColor = value }; (<any>animation)._propertyResetCallback = (value) => { animation.target.backgroundColor = value };
originalValue = nativeView.layer.backgroundColor.CGColor; originalValue = nativeView.layer.backgroundColor;
value = value.CGColor; value = value.CGColor;
break; break;
case common.Properties.opacity: case common.Properties.opacity:
@@ -351,3 +351,19 @@ export class Animation extends common.Animation implements definition.Animation
return result; return result;
} }
} }
export function _getTransformMismatchErrorMessage(view: viewModule.View): string {
// Order is important: translate, rotate, scale
var result: CGAffineTransform = CGAffineTransformIdentity;
result = CGAffineTransformTranslate(result, view.translateX, view.translateY);
result = CGAffineTransformRotate(result, view.rotate * Math.PI / 180);
result = CGAffineTransformScale(result, view.scaleX, view.scaleY);
var viewTransform = NSStringFromCGAffineTransform(result);
var nativeTransform = NSStringFromCGAffineTransform(view._nativeView.transform);
if (viewTransform !== nativeTransform) {
return "View and Native transforms do not match. View: " + viewTransform + "; Native: " + nativeTransform;
}
return undefined;
}