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

Enable Button tests, fix AbsoluteLayout tests

Browse Source
This commit is contained in:
Panayot Cankov
2017-01-20 17:51:49 +02:00
parent e34b0f622c
commit 312a99667e
14 changed files with 139 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tns-core-modules/ui/layouts/absolute-layout/absolute-layout.ios.ts
View File

@@ -54,8 +54,8 @@ export class AbsoluteLayout extends AbsoluteLayoutBase {
const childLeft = this.effectiveBorderLeftWidth + this.effectivePaddingLeft + child.effectiveLeft;
const childTop = this.effectiveBorderTopWidth + this.effectivePaddingTop + child.effectiveTop;
const childRight = childLeft + childWidth + this.effectiveMarginLeft + this.effectiveMarginRight;
const childBottom = childTop + childHeight + this.effectiveMarginTop + this.effectiveMarginBottom;
const childRight = childLeft + childWidth + child.effectiveMarginLeft + child.effectiveMarginRight;
const childBottom = childTop + childHeight + child.effectiveMarginTop + child.effectiveMarginBottom;
View.layoutChild(this, child, childLeft, childTop, childRight, childBottom);
});

12
tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout-common.ts
View File

@@ -35,7 +35,7 @@ export namespace FlexDirection {
export const COLUMN_REVERSE: "column-reverse" = "column-reverse";
export const isValid = makeValidator<FlexDirection>(ROW, ROW_REVERSE, COLUMN, COLUMN_REVERSE);
export const parse = makeParser(isValid, ROW);
export const parse = makeParser<FlexDirection>(isValid);
}
export type FlexWrap = "nowrap" | "wrap" | "wrap-reverse";
@@ -45,7 +45,7 @@ export namespace FlexWrap {
export const WRAP_REVERSE: "wrap-reverse" = "wrap-reverse";
export const isValid = makeValidator<FlexWrap>(NOWRAP, WRAP, WRAP_REVERSE);
export const parse = makeParser(isValid, NOWRAP);
export const parse = makeParser<FlexWrap>(isValid);
}
export type JustifyContent = "flex-start" | "flex-end" | "center" | "space-between" | "space-around";
@@ -57,7 +57,7 @@ export namespace JustifyContent {
export const SPACE_AROUND: "space-around" = "space-around";
export const isValid = makeValidator<JustifyContent>(FLEX_START, FLEX_END, CENTER, SPACE_BETWEEN, SPACE_AROUND);
export const parse = makeParser(isValid, FLEX_START);
export const parse = makeParser<JustifyContent>(isValid);
}
export type FlexBasisPercent = number;
@@ -74,7 +74,7 @@ export namespace AlignItems {
export const STRETCH: "stretch" = "stretch";
export const isValid = makeValidator<AlignItems>(FLEX_START, FLEX_END, CENTER, BASELINE, STRETCH);
export const parse = makeParser(isValid, FLEX_START);
export const parse = makeParser<AlignItems>(isValid);
}
export type AlignContent = "flex-start" | "flex-end" | "center" | "space-between" | "space-around" | "stretch";
@@ -87,7 +87,7 @@ export namespace AlignContent {
export const STRETCH: "stretch" = "stretch";
export const isValid = makeValidator<AlignContent>(FLEX_START, FLEX_END, CENTER, SPACE_BETWEEN, SPACE_AROUND, STRETCH);
export const parse = makeParser(isValid, FLEX_START);
export const parse = makeParser<AlignContent>(isValid);
}
export type Order = number;
@@ -143,7 +143,7 @@ export namespace AlignSelf {
export const STRETCH: "stretch" = "stretch";
export const isValid = makeValidator<AlignSelf>(AUTO, FLEX_START, FLEX_END, CENTER, BASELINE, STRETCH);
export const parse = makeParser(isValid, AUTO);
export const parse = makeParser<AlignSelf>(isValid);
}
function validateArgs(element: View): View {

2
tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
View File

@@ -368,5 +368,5 @@ export namespace GridUnitType {
export const STAR: "star" = "star";
export const AUTO: "auto" = "auto";
export const isValid = makeValidator<GridUnitType>(PIXEL, STAR, AUTO);
export const parse = makeParser(isValid, undefined);
export const parse = makeParser<GridUnitType>(isValid);
}