Merge pull request #255 from joseeight/Document

Cleaning up referencing to documentRoot

3 files changed, 12 insertions, 12 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 71959f86..460c8b4a 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -62,7 +62,7 @@ exports.Layout = Montage.create(Component, {
         value: function() {
             // Initial elements to draw are the childrens of the root element
             if(this.application.ninja.documentController.activeDocument.currentView === "design") {
-                this.elementsToDraw = this.application.ninja.documentController.activeDocument.documentRoot.childNodes;
+                this.elementsToDraw = this.application.ninja.documentController.activeDocument.model.documentRoot.childNodes;
             }
         }
     },
@@ -237,7 +237,7 @@ exports.Layout = Montage.create(Component, {
         value: function() {
             if(this.application.ninja.currentDocument) {
                 this.clearCanvas();
-                this.WalkDOM(this.application.ninja.currentDocument.documentRoot);
+                this.WalkDOM(this.application.ninja.currentDocument.model.documentRoot);
 
                 //drawUtils.updatePlanes();
                 //if(this.application.ninja.currentDocument.draw3DGrid) drawUtils.drawWorkingPlane();
@@ -249,7 +249,7 @@ exports.Layout = Montage.create(Component, {
     drawElementsOutline: {
         value: function(elements) {
             this.clearCanvas();
-            this.WalkDOM(this.application.ninja.currentDocument.documentRoot, elements);
+            this.WalkDOM(this.application.ninja.currentDocument.model.documentRoot, elements);
         }
     },
 
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 6d421e4b..c7afb95c 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -186,7 +186,7 @@ exports.Stage = Montage.create(Component, {
         set: function(value) {
             this._userPaddingLeft = value;
             this._documentOffsetLeft = -value;
-            this.application.ninja.currentDocument.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-left"] = -value + "px";
+            this.application.ninja.currentDocument.model.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-left"] = -value + "px";
             this.userContentLeft = this._documentOffsetLeft;
             this.updatedStage = true;
         }
@@ -197,7 +197,7 @@ exports.Stage = Montage.create(Component, {
         set: function(value) {
             this._userPaddingTop = value;
             this._documentOffsetTop = -value;
-            this.application.ninja.currentDocument.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-top"] = -value + "px";
+            this.application.ninja.currentDocument.model.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-top"] = -value + "px";
             this.userContentTop = this._documentOffsetTop;
             this.updatedStage = true;
         }
@@ -904,7 +904,7 @@ exports.Stage = Montage.create(Component, {
 
     setStageAsViewport: {
         value: function() {
-            this.stageDeps.viewUtils.setViewportObj(this.application.ninja.currentDocument.documentRoot);
+            this.stageDeps.viewUtils.setViewportObj(this.application.ninja.currentDocument.model.documentRoot);
         }
     },
 
@@ -912,7 +912,7 @@ exports.Stage = Montage.create(Component, {
         value: function(value) {
             if(!this._firstDraw)
             {
-                var userContent = this.application.ninja.currentDocument.documentRoot;
+                var userContent = this.application.ninja.currentDocument.model.documentRoot;
                 if (userContent)
                 {
                     var w = this._canvas.width,
@@ -943,12 +943,12 @@ exports.Stage = Montage.create(Component, {
                         {
                 case "top":
                                         plane = [0,1,0,0];
-                                        plane[3] = this.application.ninja.currentDocument.documentRoot.offsetHeight / 2.0;
+                                        plane[3] = this.application.ninja.currentDocument.model.documentRoot.offsetHeight / 2.0;
                    break;
 
                 case "side":
                                         plane = [1,0,0,0];
-                                        plane[3] = this.application.ninja.currentDocument.documentRoot.offsetWidth / 2.0;
+                                        plane[3] = this.application.ninja.currentDocument.model.documentRoot.offsetWidth / 2.0;
                    break;
 
                 case "front":
@@ -967,7 +967,7 @@ exports.Stage = Montage.create(Component, {
     setStageView: {
         value: function(side) {
             var mat,
-                currentDoc = this.application.ninja.currentDocument.documentRoot,
+                currentDoc = this.application.ninja.currentDocument.model.documentRoot,
                 isDrawingGrid = this.application.ninja.appModel.show3dGrid;
             // Stage 3d Props.
             currentDoc.elementModel.props3D.ResetTranslationValues();
diff --git a/js/stage/tool-handle.js b/js/stage/tool-handle.js
index 63cf30e5..70289512 100755
--- a/js/stage/tool-handle.js
+++ b/js/stage/tool-handle.js
@@ -243,7 +243,7 @@ exports.RotateHandle = Montage.create(ToolHandle, {
             this._origin = pointOnElt;
 
 
-            var viewMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.documentRoot);
+            var viewMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.model.documentRoot);
 
             var transMat = viewMat.slice(0);
             if(inLocalMode)
@@ -585,7 +585,7 @@ exports.TranslateHandle = Montage.create(ToolHandle, {
             this._origin = pointOnElt;
 
 
-            var stage = this.application.ninja.currentDocument.documentRoot;
+            var stage = this.application.ninja.currentDocument.model.documentRoot;
             var viewMat = viewUtils.getMatrixFromElement(stage);
             // Get viewMat without zoom value
             var zoom = this.application.ninja.documentBar.zoomFactor/100;