Accept whitespace separators in grid rows and cols properties

vakrilov · vakrilov · commit e5351786b7d6 · 2016-01-13T14:03:33.000+02:00
diff --git a/apps/tests/layouts/grid-layout-tests.ts b/apps/tests/layouts/grid-layout-tests.ts
@@ -512,10 +512,19 @@ export class GridLayoutTest extends testModule.UITest<layout.GridLayout> {
         TKUnit.assertAreClose(btn.layoutLeft, 25, DELTA, "horizontal margins");
     }
 
-    public test_set_columns_in_XML() {
+    public test_set_columns_in_XML_comma_separator() {
         var p = <page.Page>builder.parse("<Page><GridLayout columns=\"auto, *, 10*, 100 \"><Button/></GridLayout></Page>");
         var grid = <layout.GridLayout>p.content;
+        this.assertColumns(grid);
+    }
+
+    public test_set_columns_in_XML_space_separator() {
+        var p = <page.Page>builder.parse("<Page><GridLayout columns=\"auto * 10* 100 \"><Button/></GridLayout></Page>");
+        var grid = <layout.GridLayout>p.content;
+        this.assertColumns(grid);
+    }
 
+    private assertColumns(grid: layout.GridLayout) {
         var columns: Array<layout.ItemSpec> = grid.getColumns();
 
         TKUnit.assertEqual(columns.length, 4, "columns.length");
@@ -531,10 +540,19 @@ export class GridLayoutTest extends testModule.UITest<layout.GridLayout> {
         TKUnit.assertEqual(columns[3].value, 100, "columns[3].value");
     }
 
-    public test_set_rows_in_XML() {
+    public test_set_rows_in_XML_comma_separator() {
         var p = <page.Page>builder.parse("<Page><GridLayout rows=\"auto, *, 10*, 100 \"><Button/></GridLayout></Page>");
         var grid = <layout.GridLayout>p.content;
+        this.assertRows(grid);
+    }
+    public test_set_rows_in_XML_space_separator() {
+        var p = <page.Page>builder.parse("<Page><GridLayout rows=\"auto * 10* 100 \"><Button/></GridLayout></Page>");
+        var grid = <layout.GridLayout>p.content;
+        this.assertRows(grid);
+    }
 
+    private assertRows(grid: layout.GridLayout) {
+        var columns: Array<layout.ItemSpec> = grid.getColumns();
         var rows: Array<layout.ItemSpec> = grid.getRows();
 
         TKUnit.assertEqual(rows.length, 4, "rows.length");
diff --git a/ui/layouts/grid-layout/grid-layout-common.ts b/ui/layouts/grid-layout/grid-layout-common.ts
@@ -313,16 +313,18 @@ export class GridLayout extends layouts.LayoutBase implements definition.GridLay
 
     private static parseItemSpecs(value: string): Array<ItemSpec> {
         var result = new Array<ItemSpec>();
-        var arr = value.split(",");
+        var arr = value.split(/[\s,]+/);
         for (var i = 0; i < arr.length; i++) {
-            result.push(GridLayout.convertGridLength(arr[i].trim()));
+            let str = arr[i].trim();
+            if (str.length > 0) {
+                result.push(GridLayout.convertGridLength(arr[i].trim()));
+            }
         }
 
         return result;
     }
 
     private static convertGridLength(value: string): ItemSpec {
-
         if (value === "auto") {
             return <ItemSpec>new definition.ItemSpec(1, definition.GridUnitType.auto);
         }

Original file line number	Diff line number	Diff line change
`@@ -313,16 +313,18 @@ export class GridLayout extends layouts.LayoutBase implements definition.GridLay`
`313`	`313`
`314`	`314`	`private static parseItemSpecs(value: string): Array<ItemSpec> {`
`315`	`315`	`var result = new Array<ItemSpec>();`
`316`		`- var arr = value.split(",");`
	`316`	`+ var arr = value.split(/[\s,]+/);`
`317`	`317`	`for (var i = 0; i < arr.length; i++) {`
`318`		`- result.push(GridLayout.convertGridLength(arr[i].trim()));`
	`318`	`+ let str = arr[i].trim();`
	`319`	`+ if (str.length > 0) {`
	`320`	`+ result.push(GridLayout.convertGridLength(arr[i].trim()));`
	`321`	`+ }`
`319`	`322`	`}`
`320`	`323`
`321`	`324`	`return result;`
`322`	`325`	`}`
`323`	`326`
`324`	`327`	`private static convertGridLength(value: string): ItemSpec {`
`325`		`-`
`326`	`328`	`if (value === "auto") {`
`327`	`329`	`return <ItemSpec>new definition.ItemSpec(1, definition.GridUnitType.auto);`
`328`	`330`	`}`