Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture

Conflicts:
	js/document/templates/montage-web/default_html.css

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 45 insertions, 0 deletions

diff --git a/js/document/helpers/url-parser.js b/js/document/helpers/url-parser.js
new file mode 100755
index 00000000..a1a7406a
--- /dev/null
+++ b/js/document/helpers/url-parser.js
@@ -0,0 +1,45 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+////////////////////////////////////////////////////////////////////////
+//
+var Montage =   require("montage/core/core").Montage,
+        Component = require("montage/ui/component").Component;
+////////////////////////////////////////////////////////////////////////
+//      
+exports.UrlParser = Montage.create(Component, {
+        ////////////////////////////////////////////////////////////////////
+        //
+        hasTemplate: {
+        value: false
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        parseStyles: {
+        value: function (styles) {
+                //
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        loadLocalStyleSheet: {
+        value: function (path) {
+                //
+        }
+    }
+    ,
+    ////////////////////////////////////////////////////////////////////
+        //
+        loadExternalStyleSheet: {
+        value: function (path) {
+                //
+        }
+    }
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file