From 65412d9201c90a2a5d8bc28fb067f8c47cc53cae Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Wed, 22 Jul 2015 16:31:28 +0300
Subject: [PATCH 1/2] component builder simplified

---
 ui/builder/component-builder.ts | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/ui/builder/component-builder.ts b/ui/builder/component-builder.ts
index 49fb11ddc..f24d4e8da 100644
--- a/ui/builder/component-builder.ts
+++ b/ui/builder/component-builder.ts
@@ -14,34 +14,17 @@ import platform = require("platform");
 var EVENT = "Event";
 var UI_PATH = "ui/";
 var MODULES = {
-    "ActivityIndicator": "ui/activity-indicator",
-    "ListView": "ui/list-view",
     "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",
-    "ScrollView": "ui/scroll-view",
-    "SearchBar": "ui/search-bar",
-    "SlideOut": "ui/slide-out",
-    "TabView": "ui/tab-view",
     "TabViewItem": "ui/tab-view",
-    "TextField": "ui/text-field",
-    "TextView": "ui/text-view",
     "FormattedString": "text/formatted-string",
     "Span": "text/span",
-    "WebView": "ui/web-view",
-    "HtmlView": "ui/html-view",
-    "SegmentedBar": "ui/segmented-bar",
-    "SegmentedBarItem": "ui/segmented-bar",
-    "ToolBar": "ui/tool-bar",
-    "ToolBarItem": "ui/tool-bar",
-    "TimePicker": "ui/time-picker",
-    "DatePicker": "ui/date-picker",
-    "ListPicker": "ui/list-picker",
-    "ActionBar": "ui/action-bar",
     "ActionItem": "ui/action-bar",
     "NavigationButton": "ui/action-bar",
+    "SegmentedBarItem": "ui/segmented-bar",
 };
 
 var ROW = "row";
@@ -58,7 +41,7 @@ export function getComponentModule(elementName: string, namespace: string, attri
     var componentModule: definition.ComponentModule;
 
     // Get module id.
-    var moduleId = MODULES[elementName] || UI_PATH + elementName.toLowerCase();
+    var moduleId = MODULES[elementName] || UI_PATH + elementName.split(/(?=[A-Z])/).join("-").toLowerCase();
 
     try {
         if (types.isString(namespace)) {
@@ -250,4 +233,4 @@ function isBinding(value: string): boolean {
     }
 
     return isBinding;
-}
+}
\ No newline at end of file

From 5ca763455c6ac78d11fb297ddbe1e9113873eb6b Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Wed, 22 Jul 2015 17:09:28 +0300
Subject: [PATCH 2/2] 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)) {