8 files changed, 203 insertions, 69 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 89717dd6..28406ee8 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -18,25 +18,33 @@ exports.HtmlDocument = Montage.create(Component, {
                 enumerable: false,
         value: false
     },
-
+    ////////////////////////////////////////////////////////////////////
+        //
     model: {
+        enumerable: false,
         value: null
     },
-
+        ////////////////////////////////////////////////////////////////////
+        //
     loadDelegate: {
+        enumerable: false,
         value: null
     },
-
+        ////////////////////////////////////////////////////////////////////
+        //
     delegateContext: {
+        enumerable: false,
         value: null
     },
-
+        ////////////////////////////////////////////////////////////////////
+        //
     exclusionList: {
+        enumerable: false,
         value: ["HTML", "BODY"]
     },
-
-    // Getters for the model.
-    // TODO: Change how these properties are accessed through Ninja
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+        //TODO: Remove these setters/getters, should call model directly
     name: {
         get: function() {
             return this.model._name;
@@ -45,7 +53,7 @@ exports.HtmlDocument = Montage.create(Component, {
             this.model._name = value;
         }
     },
-
+    //
     isActive: {
         get: function() {
             return this.model._isActive;
@@ -54,7 +62,7 @@ exports.HtmlDocument = Montage.create(Component, {
             this.model._isActive = value;
         }
     },
-
+    //
     needsSave: {
         get: function() {
             return this.model._needsSave;
@@ -63,82 +71,62 @@ exports.HtmlDocument = Montage.create(Component, {
             this.model._needsSave = value;
         }
     },
-
-    // View Properties
-    // TODO: Move those into a view object - for now dump it here
-    iframe: {
-        value: null
-    },
-
+    //
     uuid: {
         get: function() {
             return this._uuid;
         }
     },
-
+    //
     currentView: {
         value: "design"
     },
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
-    init: {
-        value:function(file, context, callback) {
-            this.model = Montage.create(HtmlDocumentModel, {
-                file: {
-                    value: file
-                }
-            });
-
-            this.name = file.name;
-
-            // this.init(file.name, file.uri, file.extension, iframe, uuid, callback);
-
-
-            this.iframe = this.createView();
-
-            //this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"];
-            //this.currentView = "design";
-            //
-
-            this.delegateContext = context;
-            this.loadDelegate = callback;
-        }
+    //
+    iframe: { //MOVE TO: base.js in views
+        value: null 
     },
-
-    // Create View
-    // Move this into a base view object
-    createView: {
+    //
+    createView: { //MOVE TO: design.js in views
         value: function() {
             var ifr = document.createElement("iframe");
+            //
             ifr.id = "document_" + this._uuid;
-
-
             ifr.style.border = "none";
             ifr.style.background = "#FFF";
             ifr.style.height = "100%";
             ifr.style.width = "100%";
-
-            // TODO: Reable opacity to display only when done loading
-//            ifr.style.opacity = 0;
-
+            //
             ifr.src = "js/document/templates/montage-web/index.html";
             ifr.addEventListener("load", this.handleWebTemplateLoad.bind(this), true);
-
+                        //
             return document.getElementById("iframeContainer").appendChild(ifr);
         }
     },
-
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+        //
+    init: {
+        value:function(file, context, callback) {
+            this.model = Montage.create(HtmlDocumentModel, {
+                file: {
+                    value: file
+                }
+            });
+            this.name = file.name;
+            this.iframe = this.createView();
+            this.delegateContext = context;
+            this.loadDelegate = callback;
+        }
+    },
+        ////////////////////////////////////////////////////////////////////
+        //
     handleWebTemplateLoad: {
         value: function(event) {
             //TODO: Remove, also for prototyping
             this.application.ninja.documentController._hackRootFlag = true;
 
-
-            //TODO: Clean up, using for prototyping save
-//            this._templateDocument = {};
-//            this._templateDocument.html = this.iframe.contentWindow.document;
-//            this._templateDocument.body =
-
             this._window = this.iframe.contentWindow;
             this._document = this.iframe.contentWindow.document;
             this.documentRoot = this.iframe.contentWindow.document.body;
diff --git a/js/document/helpers/url-parser.js b/js/document/helpers/url-parser.js
new file mode 100755
index 00000000..878c79e9
--- /dev/null
+++ b/js/document/helpers/url-parser.js
@@ -0,0 +1,24 @@
+/* <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: {
+                enumerable: false,
+        value: false
+    }
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/models/base.js b/js/document/models/base.js
index f237e793..f4dbbc0b 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -21,20 +21,28 @@ exports.BaseDocumentModel = Montage.create(Montage, {
         file: {
         value: null
     },
-
+        ////////////////////////////////////////////////////////////////////
+        //