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

Merge pull request #2950 from NativeScript/raikov/scale

Browse Source 
Added support for scale(x)
This commit is contained in:
Vladimir Enchev
2016-10-27 15:08:34 +03:00
committed by GitHub
parent 4045bb2cd6 0292a49ea2
commit fd23197851
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tns-core-modules/ui/styling/style.ts
View File

@ -1275,10 +1275,14 @@ function onTransformChanged(value: any): Array<styleProperty.KeyValuePair<styleP
case "scale": case "scale":
case "scale3d": case "scale3d":
values = newTransform[transform].split(","); values = newTransform[transform].split(",");
if (values.length === 2 || values.length === 3) { if (values.length >= 2) {
array.push({ property: scaleXProperty, value: parseFloat(values[0]) }); array.push({ property: scaleXProperty, value: parseFloat(values[0]) });
array.push({ property: scaleYProperty, value: parseFloat(values[1]) }); array.push({ property: scaleYProperty, value: parseFloat(values[1]) });
} }
else if (values.length === 1) {
array.push({ property: scaleXProperty, value: parseFloat(values[0]) });
array.push({ property: scaleYProperty, value: parseFloat(values[0]) });
}
break; break;
case "translateX": case "translateX":
array.push({ property: translateXProperty, value: parseFloat(newTransform[transform]) }); array.push({ property: translateXProperty, value: parseFloat(newTransform[transform]) });
@ -1289,10 +1293,14 @@ function onTransformChanged(value: any): Array<styleProperty.KeyValuePair<styleP
case "translate": case "translate":
case "translate3d": case "translate3d":
values = newTransform[transform].split(","); values = newTransform[transform].split(",");
if (values.length === 2 || values.length === 3) { if (values.length >= 2) {
array.push({ property: translateXProperty, value: parseFloat(values[0]) }); array.push({ property: translateXProperty, value: parseFloat(values[0]) });
array.push({ property: translateYProperty, value: parseFloat(values[1]) }); array.push({ property: translateYProperty, value: parseFloat(values[1]) });
} }
else if (values.length === 1) {
array.push({ property: translateXProperty, value: parseFloat(values[0]) });
array.push({ property: translateYProperty, value: parseFloat(values[0]) });
}
break; break;
case "rotate": case "rotate":
let text = newTransform[transform]; let text = newTransform[transform];