From 5ca763455c6ac78d11fb297ddbe1e9113873eb6b Mon Sep 17 00:00:00 2001 From: Vladimir Enchev Date: Wed, 22 Jul 2015 17:09:28 +0300 Subject: [PATCH] layouts handled automatically as well --- ui/builder/component-builder.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ui/builder/component-builder.ts b/ui/builder/component-builder.ts index f24d4e8da..7337216a2 100644 --- a/ui/builder/component-builder.ts +++ b/ui/builder/component-builder.ts @@ -14,11 +14,6 @@ import platform = require("platform"); var EVENT = "Event"; var UI_PATH = "ui/"; var MODULES = { - "GridLayout": "ui/layouts/grid-layout", - "DockLayout": "ui/layouts/dock-layout", - "WrapLayout": "ui/layouts/wrap-layout", - "AbsoluteLayout": "ui/layouts/absolute-layout", - "StackLayout": "ui/layouts/stack-layout", "TabViewItem": "ui/tab-view", "FormattedString": "text/formatted-string", "Span": "text/span", @@ -41,7 +36,9 @@ export function getComponentModule(elementName: string, namespace: string, attri var componentModule: definition.ComponentModule; // Get module id. - var moduleId = MODULES[elementName] || UI_PATH + elementName.split(/(?=[A-Z])/).join("-").toLowerCase(); + var moduleId = MODULES[elementName] || UI_PATH + + (elementName.toLowerCase().indexOf("layout") !== -1 ? "layouts/" : "") + + elementName.split(/(?=[A-Z])/).join("-").toLowerCase(); try { if (types.isString(namespace)) {