2 files changed, 27 insertions, 4 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index f92a425c..2fc32791 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -98,7 +98,7 @@ exports.HtmlDocument = Montage.create(Component, {
                                         this.documentRoot = this.model.views.design.document.body;
                                 }
                         //TODO: Why is this needed?
-                        this._liveNodeList = this.documentRoot.getElementsByTagName('*');
+                    this.model.views.design._liveNodeList = this.documentRoot.getElementsByTagName('*');
                         //Initiliazing document model
                         document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body");
                         //Adding observer to know when template is ready
diff --git a/js/document/views/design.js b/js/document/views/design.js
index b3887fdf..13f89692 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
@@ -189,9 +215,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);
         }
     },
     ////////////////////////////////////////////////////////////////////