19 files changed, 1354 insertions, 658 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 89717dd6..56d9db02 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -7,360 +7,162 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage =           require("montage/core/core").Montage,
-        Component =         require("montage/ui/component").Component;
-    HtmlDocumentModel = require("js/document/models/html").HtmlDocumentModel;
+        Component =         require("montage/ui/component").Component,
+    HtmlDocumentModel = require("js/document/models/html").HtmlDocumentModel,
+    DesignDocumentView = require("js/document/views/design").DesignDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.HtmlDocument = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
-                enumerable: false,
         value: false
     },
-
+    ////////////////////////////////////////////////////////////////////
+        //
     model: {
         value: null
     },
-
-    loadDelegate: {
-        value: null
+        ////////////////////////////////////////////////////////////////////
+        //
+    loaded: {
+        value: {callback: null, context: null}
     },
-
-    delegateContext: {
+    ////////////////////////////////////////////////////////////////////
+        //
+    _observer: {
         value: null
     },
-
-    exclusionList: {
-        value: ["HTML", "BODY"]
-    },
-
-    // Getters for the model.
-    // TODO: Change how these properties are accessed through Ninja
-    name: {
-        get: function() {
-            return this.model._name;
-        },
-        set: function(value) {
-            this.model._name = value;
-        }
-    },
-
-    isActive: {
-        get: function() {
-            return this.model._isActive;
-        },
-        set: function(value) {
-            this.model._isActive = value;
-        }
-    },
-
-    needsSave: {
-        get: function() {
-            return this.model._needsSave;
-        },
-        set: function(value) {
-            this.model._needsSave = value;
-        }
+    ////////////////////////////////////////////////////////////////////
+        //
+    _document: {
+        value: null //TODO: Figure out if this will be needed, probably not
     },
-
-    // View Properties
-    // TODO: Move those into a view object - for now dump it here
-    iframe: {
-        value: null
+        ////////////////////////////////////////////////////////////////////
+        //
+    exclusionList: {
+        value: ["HTML", "BODY", "NINJA-CONTENT"] //TODO: Update to correct list
     },
-
-    uuid: {
-        get: function() {
-            return this._uuid;
+    ////////////////////////////////////////////////////////////////////
+        //
+    inExclusion: {
+        value: function(element) {
+            if(this.exclusionList.indexOf(element.nodeName) === -1) {
+                return -1;
+            }
+            return 1;
         }
     },
-
-    currentView: {
-        value: "design"
-    },
-        ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
+        //
     init: {
-        value:function(file, context, callback) {
-            this.model = Montage.create(HtmlDocumentModel, {
-                file: {
-                    value: file
-                }
+        value:function(file, context, callback, view, template) {
+                //Storing callback data for loaded dispatch
+                this.loaded.callback = callback;
+                this.loaded.context = context;
+            //Creating instance of HTML Document Model
+            this.model = Montage.create(HtmlDocumentModel,{
+                file: {value: file},
+                fileTemplate: {value: template},
+                parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach
+                views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic
             });
-
-            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";
+            //Initiliazing views and hiding
+                if (this.model.views.design.initialize(this.model.parentContainer)) {
+                        //Hiding iFrame, just initiliazing
+                        this.model.views.design.hide();
+                } else {
+                        //ERROR: Design View not initilized
+                }
             //
-
-            this.delegateContext = context;
-            this.loadDelegate = callback;
-        }
-    },
-
-    // Create View
-    // Move this into a base view object
-    createView: {
-        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);
-        }
-    },
-
-    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;
+            if (view === 'design') {
+                //TODO: Remove reference and use as part of model
+                this.currentView = 'design';
+                //Setting current view object to design
+                this.model.currentView = this.model.views.design;
+                //Showing design iFrame
+                this.model.views.design.show();
+                this.model.views.design.iframe.style.opacity = 0;
+                this.model.views.design.content = this.model.file.content;
+                //TODO: Improve reference
+                this.model.views.design.model = this.model;
+                //
+                //TODO: Clean up
+                this.model.views.design.render(function () {
+                        //TODO: Identify and remove usage of '_document'
+                        this._document = this.model.views.design.document;
+                        //TODO: Remove usage, seems as not needed
+                                if (template && template.type === 'banner') {
+                                        this.documentRoot = this.model.views.design.document.body.getElementsByTagName('ninja-content')[0];
+                                } else {
+                                        this.documentRoot = this.model.views.design.document.body;
+                                }
+                        //TODO: Why is this needed?
+                        this._liveNodeList = this.documentRoot.getElementsByTagName('*');
+                        //Initiliazing document model
+                        document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body");
+                        //Adding observer to know when template is ready
+                        this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this));
+                                this._observer.observe(this.model.views.design.document.head, {childList: true});
+                }.bind(this), template);
+            } else {
+                //TODO: Identify default view (probably code)