From 3e1b591bdebbfd9b7380ceda5a2b884a602b371a Mon Sep 17 00:00:00 2001
From: Hristo Deshev <hristo@deshev.com>
Date: Wed, 23 Dec 2015 15:23:26 +0200
Subject: [PATCH] Improve default namespace skips.

- Check every parsed namespace instead of running a global regex on the
whole input
- Check for namespaces ending in tns.xsd and allow schemas hosted on
different URL's than the default one.
---
 ui/builder/builder.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/builder/builder.ts b/ui/builder/builder.ts
index 94fa4ed3b..f9b0e3dc1 100644
--- a/ui/builder/builder.ts
+++ b/ui/builder/builder.ts
@@ -11,6 +11,8 @@ import {Page} from "ui/page";
 import {resolveFileName} from "file-system/file-name-resolver";
 import * as traceModule from "trace";
 
+const defaultNameSpaceMatcher = /tns\.xsd$/i;
+
 export function parse(value: string | Template, context: any): View {
     if (isString(value)) {
         var viewToReturn: View;
@@ -196,7 +198,6 @@ namespace xml2ui {
             }, true);
 
             if (isString(value)) {
-                value = value.replace(/xmlns=("|')http:\/\/((www)|(schemas))\.nativescript\.org\/tns\.xsd\1/, "");
                 xmlParser.parse(value);
             }
         }
@@ -456,7 +457,12 @@ namespace xml2ui {
                         componentModule = loadCustomComponent(args.namespace, args.elementName, args.attributes, this.context, this.currentPage);
                     } else {
                         // Default components
-                        componentModule = getComponentModule(args.elementName, args.namespace, args.attributes, this.context);
+                        let namespace = args.namespace;
+                        if (defaultNameSpaceMatcher.test(namespace || '')) {
+                            //Ignore the default ...tns.xsd namespace URL
+                            namespace = undefined;
+                        }
+                        componentModule = getComponentModule(args.elementName, namespace, args.attributes, this.context);
                     }
 
                     if (componentModule) {