3 files changed, 24 insertions, 44 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index a6d2d899..a8bc16ef 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -138,7 +138,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     l,
                     t,
                     plane,
-                    elt
+                    elt;
                 for(i=0; i<len; i++) {
                     elt = documentRootChildren[i];
                     plane = this.addElement(elt);
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 2e8020d3..7194524e 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -21,7 +21,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         ///////////////////////////////////////////////////////////////////////
         // Instance variables
         ///////////////////////////////////////////////////////////////////////
-    currentStage: { value: null, writable: true },
     drawingCanvas: { value: null, writable: true},
     
         // we keep a stack of working planes to facilitate working on other planes temporarily
@@ -84,14 +83,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         popWorkingPlane : { value: function ()          { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
         getStageWidth : { value: function ()            {
-                return parseInt(this.currentStage.offsetWidth);
+                return parseInt(this.application.ninja.currentDocument.documentRoot.offsetWidth);
         }},
 
         getStageHeight : { value: function ()           {
-                return parseInt(this.currentStage.offsetHeight);
+                return parseInt(this.application.ninja.currentDocument.documentRoot.offsetHeight);
         }},
 
-    getStage : { value: function()              {        return this.currentStage;    }},
+    getStage : { value: function()              {        return this.application.ninja.currentDocument.documentRoot;    }},
 
         getGridVertexHitRad : { value: function()               {  return this._gridVertexHitRad;                               }},
         getGridEdgeHitRad : { value: function()         {  return this._gridEdgeHitRad;                                 }},
@@ -185,12 +184,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         }
     },
 
-    setCurrentStage: {
-        value: function(stage) {
-            this.currentStage = stage;
-        }
-    },
-
         snap : {
                 value: function (xScreen, yScreen, snap3D,  quadPt) 
                 {
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 8c338f84..20f61be1 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -18,18 +18,14 @@ exports.ViewUtils = Montage.create(Component, {
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
 
-    m_viewportObj : { value: null, writable: true},
-    _perspectiveDist: { value: null, writable: true},
+    m_viewportObj : { value: null},
+    _perspectiveDist: { value: null},
 
     // keep a stack of viewport objects
-    _viewportObjStack: { value: [], writable: true },
+    _viewportObjStack: { value: []},
 
-    _currentDocument: { value: null , writable: true},
-    _userContentLeft: { value: null , writable: true},
-    _userContentTop: { value: null , writable: true},
-
-    _rootElement: { value: null, writable: true},
-    _stageElement: { value: null, writable: true},
+    _userContentLeft: { value: null},
+    _userContentTop: { value: null},
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
@@ -43,18 +39,9 @@ exports.ViewUtils = Montage.create(Component, {
     },
     getViewportObj: { value: function()                 {  return this.m_viewportObj;   } },
 
-    setRootElement: { value: function( elt )            { this._rootElement = elt; } },
-    getRootElement: { value: function ()                { return this._rootElement;        } },
-
-    setStageElement: { value: function( elt )    {  this._stageElement = elt;    } },
-    getStageElement: { value: function () { return this._stageElement; } },
-
-    setCurrentDocument: { value: function(value) { this._currentDocument = value; }},
-
     setUserContentLeft: { value: function(value) { this._userContentLeft = value; }},
     setUserContentTop: { value: function(value) { this._userContentTop = value; }},
 
-
     getPerspectiveDistance: { value: function () { return this._perspectiveDist; } },
 
     ///////////////////////////////////////////////////////////////////////
@@ -302,7 +289,7 @@ exports.ViewUtils = Montage.create(Component, {
     // into stage world space.
     postViewToStageWorld: {
         value: function( localPt, elt ) {
-            if ((elt == null) || (elt === this._stageElement))  return localPt;
+            if ((elt == null) || (elt === this.application.ninja.currentDocument.documentRoot))  return localPt;
 
             // get the 3D transformation and 2D offset from the element
             var pt = localPt.slice(0);
@@ -329,7 +316,7 @@ exports.ViewUtils = Montage.create(Component, {
                 this.popViewportObj();
 
                 // check if we are done
-                if (parent === this._stageElement)  break;
+                if (parent === this.application.ninja.currentDocument.documentRoot)  break;
 
                 if (this.elementHas3D( parent ))
                 {
@@ -358,13 +345,13 @@ exports.ViewUtils = Montage.create(Component, {
             {
                 pt = this.childToParent( pt, child );
 
-//                if (child === this._stageElement)  break;
+//                if (child === this.application.ninja.currentDocument.documentRoot)  break;
 //                child = child.offsetParent;
 
-                if (child === this._stageElement)  break;
-                if (child === this._rootElement)  break;
+                if (child === this.application.ninja.currentDocument.documentRoot)  break;
+                if (child === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
                 child = child.offsetParent;
-                if (child === this._rootElement)  break;
+                if (child === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
             }
 
             /////////////////////////////////////////////////////////
@@ -414,7 +401,7 @@ exports.ViewUtils = Montage.create(Component, {
                 {
                     // TODO - Commenting out flatten support until new perspective workflow is fully working
                     // if (flatten)  pt[2] = 0;
-//                    var flatten = (parent !== this._rootElement) && (ElementsMediator.getProperty(parent, "-webkit-transform-style") !== "preserve-3d");
+//                    var flatten = (parent !== this.application.ninja.currentDocument.documentRoot.parentNode) && (ElementsMediator.getProperty(parent, "-webkit-transform-style") !== "preserve-3d");
 //                    if(flatten)
 //                    {
 //                        pt[2] = 0;
@@ -699,7 +686,7 @@ exports.ViewUtils = Montage.create(Component, {
         //        if (elt.__ninjaXOff)  xOff = elt.__ninjaXOff;
         //        if (elt.__ninjaYOff)  yOff = elt.__ninjaYOff;
             var offset = [xOff, yOff];
-            if(elt.offsetParent && (elt.offsetParent !== this._stageElement))
+            if(elt.offsetParent && (elt.offsetParent !== this.application.ninja.currentDocument.documentRoot))
             {
                 var pS = elt.ownerDocument.defaultView.getComputedStyle(elt.offsetParent);
 
@@ -715,7 +702,7 @@ exports.ViewUtils = Montage.create(Component, {
                 }
             }
 
-            if(elt === this._stageElement)
+            if(elt === this.application.ninja.currentDocument.documentRoot)
             {
                 // TODO - Call a routine from the user document controller to get the offsets/margins
                 // Once we expose the document controller to ViewUtils
@@ -1006,7 +993,7 @@ exports.ViewUtils = Montage.create(Component, {
                     glmat4.multiply( v2s, mat, mat );
 
                 // TODO - Commenting out flatten support until new perspective workflow is fully working
-//                    var flatten = (elt !== this._rootElement) && (elt.parentElement !== this._rootElement) && (ElementsMediator.getProperty(elt.parentElement, "-webkit-transform-style") !== "preserve-3d");
+//                    var flatten = (elt !== this.application.ninja.currentDocument.documentRoot.parentNode) && (elt.parentElement !== this.application.ninja.currentDocument.documentRoot.parentNode) && (ElementsMediator.getProperty(elt.parentElement, "-webkit-transform-style") !== "preserve-3d");
 //                    if(flatten)
 //                    {
 //                        glmat4.multiply( zMat, mat, mat );
@@ -1020,10 +1007,10 @@ exports.ViewUtils = Montage.create(Component, {
 
                 this.popViewportObj();
 
-                if (elt === this._stageElement)  break;
+                if (elt === this.