8 files changed, 103 insertions, 95 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/document-text.js b/js/document/document-text.js
index bb63f5f8..811cc8ce 100755
--- a/js/document/document-text.js
+++ b/js/document/document-text.js
@@ -6,17 +6,16 @@ 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,
+var Montage =                   require("montage/core/core").Montage,
+        Component =             require("montage/ui/component").Component,
     TextDocumentModel = require("js/document/models/text").TextDocumentModel,
-    CodeDocumentView = require("js/document/views/code").CodeDocumentView;
+    CodeDocumentView =  require("js/document/views/code").CodeDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.TextDocument = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
-                enumerable: false,
         value: false
     },
         ////////////////////////////////////////////////////////////////////
@@ -26,45 +25,47 @@ exports.TextDocument = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
-
     init:{
-        enumerable: false,
-        value : function(file, context, callback, view){
-            var codeDocumentView = CodeDocumentView.create(), container = null;
-
+        value: function(file, context, callback, view){
+                //
+            var codeDocumentView = CodeDocumentView.create(), container = null; //TODO: Why is this initilzied to null?
             //Creating instance of Text Document Model
             this.model = Montage.create(TextDocumentModel,{
                 file: {value: file},
-                parentContainer: {value: document.getElementById("codeViewContainer")},
-                views: {value: {'code': codeDocumentView, 'design': null}}
+                parentContainer: {value: document.getElementById("codeViewContainer")}, //TODO: Remove reference to this element, should be dynamic
+                views: {value: {'code': codeDocumentView, 'design': null}} //TODO: Add check if file might have design view, if so, then create it
             });
-
+            //TODO: Add design view logic
+            //Initilizing view(s)
             codeDocumentView.initialize(this.model.parentContainer);
-
-            codeDocumentView.textArea.value = file.content;
-            codeDocumentView.initializeTextView(file, this);
-
+            //Checking for view specified
             if (view === 'code') {
                 //TODO: Remove reference and use as part of model
                 this.currentView = 'code';
                 //Setting current view object to design
                 this.model.currentView = this.model.views.code;
+                //Rendering view
+                codeDocumentView.textArea.value = file.content;
+                codeDocumentView.initializeTextView(file, this);
+            } else {
+                    //Other view(s) logic goes here
             }
-
-
-            callback.call(context, this);
+            //Checking if callback is needed
+            if (callback) callback.call(context, this);
         }
     },
-////////////////////////////////////////////////////////////////////
-    //
-    closeDocument: {
-                value: function (context, callback) {
-                        var closed = this.model.close(null);
-
-                callback.call(context, this);
-                }
-        }
-////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+        //
+        closeDocument: {
+                value: function (context, callback) {
+                        //Closing document and getting outcome
+                        var closed = this.model.close(null);
+                        //Making callback if specified
+                        if (callback) callback.call(context, this);
+                }
+        }
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
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/code.js b/js/document/views/code.js
index 66d1c702..0a0ff5c1 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -10,15 +10,13 @@ var Montage = 			require("montage/core/core").Montage,