7 files changed, 95 insertions, 102 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..427ef706 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -67,8 +67,44 @@ 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 this._liveNodeList;
+            }
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+
+    initialPaddingLeft: {
+        value: 0
+    },
+
+    initialPaddingTop: {
+        value: 0
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+
+    //
         initialize: {
         value: function (parent) {
                 //Creating iFrame for view
@@ -190,8 +226,10 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 //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);
+//            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);
+//            this.initialPaddingLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
+//            this.initialPaddingTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index bf48a723..79be5c14 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -119,7 +119,10 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
     initializeFromDocument:{
         value:function(){
-            var documentRootChildren = null, i, stage = this.application.ninja.stage;
+            var i,
+                documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true),
+                stage = this.application.ninja.stage,
+                len = documentRootChildren.length;
             //initialize with current document
             this._eltArray = [];
             this._planesArray = [];
@@ -128,11 +131,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this.setWorkingPlane( [0,0,1,0] );
 
             //Loop through all the top-level children of the current document and call drawUtils.addElement on them
-            if(this.application.ninja.currentDocument._liveNodeList.length > 0){
-                documentRootChildren = this.application.ninja.currentDocument._liveNodeList;
-                var len = documentRootChildren.length,
-                    minLeft = stage.userPaddingLeft,
-                    minTop = stage.userPaddingTop,
+            if(len > 0) {
+                var initL = 0,
+                    initT = 0,
+                    minLeft = 0,
+                    minTop = 0,
                     docLeft = stage.documentOffsetLeft,
                     docTop = stage.documentOffsetTop,
                     l,
@@ -151,10 +154,10 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         minTop = t;
                     }
                 }
-                if(minLeft !== stage.userPaddingLeft) {
+                if(minLeft !== initL) {
                     stage.userPaddingLeft = minLeft;
                 }
-                if(minTop !== stage.userPaddingTop) {
+                if(minTop !== initT) {
                     stage.userPaddingTop = minTop;
                 }
             }
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 0080bf90..24b30298 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -24,9 +24,6 @@ exports.ViewUtils = Montage.create(Component, {
     // keep a stack of viewport objects
     _viewportObjStack: { value: []},
 
-    _userContentLeft: { value: null},
-    _userContentTop: { value: null},
-
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -39,9 +36,6 @@ exports.ViewUtils = Montage.create(Component, {
     },
     getViewportObj: { value: function()                 {  return this.m_viewportObj;   } },
 
-    setUserContentLeft: { value: function(value) { this._userContentLeft = value; }},
-    setUserContentTop: { value: function(value) { this._userContentTop = value; }},
-
     getPerspectiveDistance: { value: function () { return this._perspectiveDist; } },
 
     ///////////////////////////////////////////////////////////////////////
@@ -385,7 +379,7 @@ exports.ViewUtils = Montage.create(Component, {
             // transform the bounds up the tree
             var parent = child.offsetParent;
             // TODO - Should have a different way to check for new template mode
-            if ( parent || ((child === this.application.ninja.currentDocument.documentRoot) && (child.id !== "UserContent")) )
+            if ( parent || (child === this.application.ninja.currentDocument.documentRoot) )
             {
                 this.setViewportObj( child );
 
@@ -703,8 +697,8 @@ exports.ViewUtils = Montage.create(Component, {
             {
                 // TODO - Call a routine from the user document controller to get the offsets/margins
                 // Once we expose the document controller to ViewUtils
-                offset[0] += this._userContentLeft;
-                offset[1] += this._userContentTop;
+                offset[0] += this.application.ninja.stage._userContentLeft;
+                offset[1] += this.application.ninja.stage._userContentTop;
             }
 
             return offset;
@@ -1282,7 +1276,6 @@ exports.ViewUtils = Montage.create(Component, {
 //      stageManager._canvas:                   this.application.ninja.stage.canvas
 //      stageManager.layoutCanvas:              this.application.ninja.stage.layoutCanvas
 //      stageManager.drawingCanvas:             this.application.ninja.stage.drawingCanvas
-//      stageManager.userContentLeft    this.application.ninja.stage.userContentLeft
 //      viewUtils:                                              stage.viewUtils;
 //      snapManager                                             stage.snapManager;
 //
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 9c5e2167..107e8abf 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -64,10 +64,10 @@ exports.Layout = Montage.create(Component, {
             if(this.application.ninja.documentController.activeDocument.currentView === "design") {
                 this.elementsToDraw = this.application.ninja.documentController.activeDocument.documentRoot.childNodes;
             }
-
-            // Draw the elements and the 3d info
-            this.draw();
-            this.draw3DInfo(false);
+//
+//            // Draw the elements and the 3d info
+//            this.draw();
+//            this.draw3DInfo(false);
         }
     },
 
@@ -89,7 +89,8 @@ exports.Layout = Montage.create(Component, {
 
             if(this.application.ninja.documentController.activeDocument.currentView === "design"){