Merge branch 'refs/heads/dom-architecture' into binding

6 files changed, 53 insertions, 32 deletions

diff --git a/js/document/html-document.js b/js/document/_toDelete/html-document.js
index 447d90e3..447d90e3 100755
--- a/js/document/html-document.js
+++ b/js/document/_toDelete/html-document.js
diff --git a/js/document/text-document.js b/js/document/_toDelete/text-document.js
index 2574b67c..2574b67c 100755
--- a/js/document/text-document.js
+++ b/js/document/_toDelete/text-document.js
diff --git a/js/document/document-html.js b/js/document/document-html.js
index f92a425c..c60a12a2 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -6,10 +6,10 @@ 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,
-    DesignDocumentView = require("js/document/views/design").DesignDocumentView;
+var Montage =                   require("montage/core/core").Montage,
+        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, {
@@ -33,15 +33,10 @@ exports.HtmlDocument = Montage.create(Component, {
     _observer: {
         value: null
     },
-    ////////////////////////////////////////////////////////////////////
-        //
-    _document: {
-        value: null //TODO: Figure out if this will be needed, probably not
-    },
         ////////////////////////////////////////////////////////////////////
         //
     exclusionList: {
-        value: ["HTML", "BODY", "NINJA-CONTENT"] //TODO: Update to correct list
+        value: ["HTML", "BODY", "NINJA-CONTENT"]
     },
     ////////////////////////////////////////////////////////////////////
         //
@@ -72,7 +67,7 @@ exports.HtmlDocument = Montage.create(Component, {
                         //Hiding iFrame, just initiliazing
                         this.model.views.design.hide();
                 } else {
-                        //ERROR: Design View not initilized
+                        //ERROR: Design View not initialized
                 }
             //
             if (view === 'design') {
@@ -84,23 +79,10 @@ exports.HtmlDocument = Montage.create(Component, {
                 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
+                //TODO: Improve reference (probably through binding values)
                 this.model.views.design.model = this.model;
-                //
-                //TODO: Clean up
+                //Rendering design view, using observers to know when template is ready
                 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});
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 9cc8ce92..fd42d4de 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -64,6 +64,11 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     userComponents: {
         value: {}
     },
+    ////////////////////////////////////////////////////////////////////
+        //
+    documentRoot: {
+        value: null
+    },
         ////////////////////////////////////////////////////////////////////
         //Add a reference to a component instance to the userComponents hash using the element UUID
     setComponentInstance: {
diff --git a/js/document/views/base.js b/js/document/views/base.js
index db72cc60..d13dce1a 100755
--- a/js/document/views/base.js
+++ b/js/document/views/base.js
@@ -28,7 +28,7 @@ exports.BaseDocumentView = Montage.create(Component, {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+        //TODO: This should be renamed to better illustrate it's a container (iframe for design, div for code view)
         iframe: {
                 get: function() {return this._iframe;},
         set: function(value) {this._iframe= value;}
diff --git a/js/document/views/design.js b/js/document/views/design.js
index b3887fdf..d772aa86 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -67,8 +67,34 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     propertiesPanel: {
         value: null
     },
+
     ////////////////////////////////////////////////////////////////////
     //
+    _liveNodeList: {
+        value: null
+    },
+
+    getLiveNodeList: {
+        value: function(useFilter) {
+            if(useFilter) {
+                var filteredNodes = [],
+                    childNodes = Array.prototype.slice.call(this._liveNodeList, 0);
+
+                childNodes.forEach(function(item) {
+                    if( (item.nodeType === 1) && (item.nodeName !== "STYLE") && (item.nodeName !== "SCRIPT")) {
+                        filteredNodes.push(item);
+                    }
+                });
+                return filteredNodes;
+            } else {
+                return Array.prototype.slice.call(this._liveNodeList, 0);
+            }
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+
+    //
         initialize: {
         value: function (parent) {
                 //Creating iFrame for view
@@ -87,7 +113,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         render: {
         value: function (callback, template) {
                 //TODO: Remove, this is a temp patch for webRequest API gate
-                this.application.ninja.documentController._hackRootFlag = false;
+                this.application.ninja.documentController.redirectRequests = false;
                 //Storing callback for dispatch ready
                 this._callback = callback;
                 this._template = template;
@@ -105,7 +131,8 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         //
     onTemplateLoad: {
         value: function (e) {
-                this.application.ninja.documentController._hackRootFlag = true;
+                //console.log(this.iframe.contentWindow);
+                this.application.ninja.documentController.redirectRequests = true;
                 //TODO: Add support to constructing URL with a base HREF
                 var basetag = this.content.document.getElementsByTagName('base');
                 //Removing event
@@ -189,9 +216,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 this._bodyFragment = null;
                 //Calling standard method to finish opening document
                 this.bodyContentLoaded(null);
-            //TODO: Move this to be set via the controller
-            this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
-            this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -256,6 +280,16 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
             } else {
                 //Else there is not data to parse
             }
+            //TODO: Verify appropiate location for this operation
+                if (this._template && this._template.type === 'banner') {
+                        this.model.documentRoot = this.document.body.getElementsByTagName('ninja-content')[0];
+                } else {
+                        this.model.documentRoot = this.document.body;
+                }
+                //Storing node list for reference (might need to store in the model)
+                this._liveNodeList = this.model.documentRoot.getElementsByTagName('*');
+                //Initiliazing document model
+                document.application.njUtils.makeElementModel(this.model.documentRoot, "Body", "body");
                 //Makign callback if specified
                 if (this._callback) this._callback();
         }