Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture

3 files changed, 31 insertions, 31 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 79be5c14..871b832d 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -127,7 +127,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this._eltArray = [];
             this._planesArray = [];
             this.setDrawingSurfaceElement(stage.canvas);
-            this.setSourceSpaceElement( this.application.ninja.currentDocument.documentRoot);
+            this.setSourceSpaceElement( this.application.ninja.currentDocument.model.documentRoot);
             this.setWorkingPlane( [0,0,1,0] );
 
             //Loop through all the top-level children of the current document and call drawUtils.addElement on them
@@ -700,7 +700,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this._lineColor = saveColor;
                         this._drawingContext.lineWidth = saveLineWidth;
 
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+            if(this.application.ninja.currentDocument.model.documentRoot.id !== "UserContent") {
                 // draw an outline around the body
                 var stagePt = MathUtils.getPointOnPlane([0,0,1,0]);
                 var stageMat = this.getPlaneToWorldMatrix([0,0,1], stagePt);
@@ -818,7 +818,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         // draw the lines
             var line,
                             nLines = this._gridLineArray.length;
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+            if(this.application.ninja.currentDocument.model.documentRoot.id !== "UserContent") {
                             nLines = this._gridLineArray.length-4;
             }
 
@@ -827,7 +827,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                 this.drawIntersectedLine(line, this._drawingContext);
                         }
 
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+            if(this.application.ninja.currentDocument.model.documentRoot.id !== "UserContent") {
                 this._lineColor = "red";
                 i = nLines;
                 nLines += 4;
@@ -926,7 +926,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                 // if all of the planes are aligned, check if they are aligned with the view direction
                                 if (flat)
                                 {
-                                        var stage = this.application.ninja.currentDocument.documentRoot;
+                                        var stage = this.application.ninja.currentDocument.model.documentRoot;
                                         var stageMat = this.viewUtils.getMatrixFromElement(stage);
                                         var viewDir = [ stageMat[8], stageMat[9], stageMat[10] ];
                                         viewDir = vecUtils.vecNormalize( 3, viewDir );
@@ -1216,7 +1216,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 value: function() {
                         // set the element to be the viewport object - temporarily
                         var tmpCanvas = this.application.ninja.stage.canvas;
-                        var tmpStage = this.application.ninja.currentDocument.documentRoot;
+                        var tmpStage = this.application.ninja.currentDocument.model.documentRoot;
                         this.viewUtils.pushViewportObj( tmpCanvas );
 
                         // save the source space object and set to the target object
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index f0f8dbe4..069c6022 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -83,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.application.ninja.currentDocument.documentRoot.offsetWidth);
+                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetWidth);
         }},
 
         getStageHeight : { value: function ()           {
-                return parseInt(this.application.ninja.currentDocument.documentRoot.offsetHeight);
+                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetHeight);
         }},
 
-    getStage : { value: function()              {        return this.application.ninja.currentDocument.documentRoot;    }},
+    getStage : { value: function()              {        return this.application.ninja.currentDocument.model.documentRoot;    }},
 
         getGridVertexHitRad : { value: function()               {  return this._gridVertexHitRad;                               }},
         getGridEdgeHitRad : { value: function()         {  return this._gridEdgeHitRad;                                 }},
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 24b30298..a3d09404 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -120,7 +120,7 @@ exports.ViewUtils = Montage.create(Component, {
             var yVec = [0,1,0];
             var zVec = [0,0,1];
 
-            var stage = this.application.ninja.currentDocument.documentRoot;
+            var stage = this.application.ninja.currentDocument.model.documentRoot;
             var stageMat = this.getMatrixFromElement(stage);
 
                         var mat = glmat4.multiply( stageMat, objMat, [] );
@@ -280,7 +280,7 @@ exports.ViewUtils = Montage.create(Component, {
     // into stage world space.
     postViewToStageWorld: {
         value: function( localPt, elt ) {
-            if ((elt == null) || (elt === this.application.ninja.currentDocument.documentRoot))  return localPt;
+            if ((elt == null) || (elt === this.application.ninja.currentDocument.model.documentRoot))  return localPt;
 
             // get the 3D transformation and 2D offset from the element
             var pt = localPt.slice(0);
@@ -307,7 +307,7 @@ exports.ViewUtils = Montage.create(Component, {
                 this.popViewportObj();
 
                 // check if we are done
-                if (parent === this.application.ninja.currentDocument.documentRoot)  break;
+                if (parent === this.application.ninja.currentDocument.model.documentRoot)  break;
 
                 if (this.elementHas3D( parent ))
                 {
@@ -336,13 +336,13 @@ exports.ViewUtils = Montage.create(Component, {
             {
                 pt = this.childToParent( pt, child );
 
-//                if (child === this.application.ninja.currentDocument.documentRoot)  break;
+//                if (child === this.application.ninja.currentDocument.model.documentRoot)  break;
 //                child = child.offsetParent;
 
-                if (child === this.application.ninja.currentDocument.documentRoot)  break;
-                if (child === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
+                if (child === this.application.ninja.currentDocument.model.documentRoot)  break;
+                if (child === this.application.ninja.currentDocument.model.documentRoot.parentNode)  break;
                 child = child.offsetParent;
-                if (child === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
+                if (child === this.application.ninja.currentDocument.model.documentRoot.parentNode)  break;
             }
 
             /////////////////////////////////////////////////////////
@@ -379,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) )
+            if ( parent || (child === this.application.ninja.currentDocument.model.documentRoot) )
             {
                 this.setViewportObj( child );
 
@@ -392,7 +392,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.application.ninja.currentDocument.documentRoot.parentNode) && (ElementsMediator.getProperty(parent, "-webkit-transform-style") !== "preserve-3d");
+//                    var flatten = (parent !== this.application.ninja.currentDocument.model.documentRoot.parentNode) && (ElementsMediator.getProperty(parent, "-webkit-transform-style") !== "preserve-3d");
 //                    if(flatten)
 //                    {
 //                        pt[2] = 0;
@@ -452,7 +452,7 @@ exports.ViewUtils = Montage.create(Component, {
             // get the four corners of the element in global space
             var bounds = this.getElementViewBounds3D( elt );
             var bounds3D = new Array();
-            var stage = this.application.ninja.currentDocument.documentRoot;
+            var stage = this.application.ninja.currentDocument.model.documentRoot;
             for (var i=0;  i<3;  i++)
             {
                 var gPt = this.localToGlobal( bounds[i],  elt );
@@ -677,7 +677,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.application.ninja.currentDocument.documentRoot))
+            if(elt.offsetParent && (elt.offsetParent !== this.application.ninja.currentDocument.model.documentRoot))
             {
                 var pS = elt.ownerDocument.defaultView.getComputedStyle(elt.offsetParent);
 
@@ -693,7 +693,7 @@ exports.ViewUtils = Montage.create(Component, {
                 }
             }
 
-            if(elt === this.application.ninja.currentDocument.documentRoot)
+            if(elt === this.application.ninja.currentDocument.model.docum