Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document

Conflicts:
	js/document/document-html.js
	js/helper-classes/3D/view-utils.js
	js/stage/stage.reel/stage.js

3 files changed, 14 insertions, 25 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 9de85216..871b832d 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/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index d937e897..069c6022 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -470,13 +470,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                 }
         },
 
-    reload2DCache: {
-        value: function() {
-            this.clear2DCache();
-            this.load2DCache(workingPlane);
-        }
-    },
-
         clear2DCache : {
                 value : function() {
                         // clear the 2D cache flags in the objects
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index f5ab7172..a3d09404 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.model.documentRoot) && (child.id !== "UserContent")) )
+            if ( parent || (child === this.application.ninja.currentDocument.model.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;
 //