Merge branch 'refs/heads/dom-architecture' into binding

8 files changed, 41 insertions, 39 deletions

diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index 5cfeec75..39f89d17 100755
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -47,8 +47,8 @@ exports.PanTool = Montage.create(toolBase,
     HandleLeftButtonDown: {
         value : function ( event ) {
             // Determine the maximum horizontal and vertical scroll values
-            this._maxHorizontalScroll = this.application.ninja.currentDocument.documentRoot.scrollWidth - this.application.ninja.stage._canvas.width - 11;
-            this._maxVerticalScroll = this.application.ninja.currentDocument.documentRoot.scrollHeight - this.application.ninja.stage._canvas.height - 11;
+            this._maxHorizontalScroll = this.application.ninja.currentDocument.model.documentRoot.scrollWidth - this.application.ninja.stage._canvas.width - 11;
+            this._maxVerticalScroll = this.application.ninja.currentDocument.model.documentRoot.scrollHeight - this.application.ninja.stage._canvas.height - 11;
             if((this._maxHorizontalScroll > 0) || (this._maxVerticalScroll > 0) || this._altKeyDown)
             {
                 this._isDrawing = true;
@@ -121,7 +121,7 @@ exports.PanTool = Montage.create(toolBase,
         {
         value: function ()
                 {
-                        var uc = this.application.ninja.currentDocument.documentRoot;
+                        var uc = this.application.ninja.currentDocument.model.documentRoot;
                         //var uc = documentManagerModule.DocumentManager.activeDocument
                         var ucMat = viewUtils.getMatrixFromElement(uc);
 
@@ -152,7 +152,7 @@ exports.PanTool = Montage.create(toolBase,
 
                         delta *= zoom;
            
-                        var uc = this.application.ninja.currentDocument.documentRoot;
+                        var uc = this.application.ninja.currentDocument.model.documentRoot;
                         var ucMat = viewUtils.getMatrixFromElement(uc);
                         var offset = viewUtils.getElementOffset( uc );
                         //console.log( "uc offset: " + offset[0] );
@@ -224,7 +224,7 @@ exports.PanTool = Montage.create(toolBase,
                                 if (elt)
                                 {
                                         // get the userContent object (stage) and its matrix
-                                        var userContent = this.application.ninja.currentDocument.documentRoot;
+                                        var userContent = this.application.ninja.currentDocument.model.documentRoot;
                                         var ucMat = viewUtils.getMatrixFromElement(userContent);
 
                                         var localToGlobalMat = viewUtils.getLocalToGlobalMatrix( elt );
@@ -358,7 +358,7 @@ exports.PanTool = Montage.create(toolBase,
                                         delta[2] = 0;
 
                                 // limit the change
-                                var ucMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.documentRoot);
+                                var ucMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.model.documentRoot);
                                 var tooMuch = false;
                                 if ((ucMat[12] >  12000) && (delta[0] > 0))  tooMuch = true;
                                 if ((ucMat[12] < -12000) && (delta[0] < 0))  tooMuch = true;
@@ -397,7 +397,7 @@ exports.PanTool = Montage.create(toolBase,
                 value: function( transMat )
                 {
                         // update the user content matrix
-                        var uc = this.application.ninja.currentDocument.documentRoot;
+                        var uc = this.application.ninja.currentDocument.model.documentRoot;
                         var ucMat = viewUtils.getMatrixFromElement(uc);
                         var newUCMat = glmat4.multiply( transMat, ucMat, [] );
                         viewUtils.setMatrixForElement( uc, newUCMat );
@@ -412,7 +412,7 @@ exports.PanTool = Montage.create(toolBase,
                 value: function()
                 {
                         // get the userContent object
-                        var userContent = this.application.ninja.currentDocument.documentRoot;
+                        var userContent = this.application.ninja.currentDocument.model.documentRoot;
 
                         // get a matrix from user content world space to the screen
                         viewUtils.pushViewportObj( userContent );
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index 4fa8657e..bf9537dd 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -32,7 +32,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 
             var selectedElements = this.application.ninja.selectedElements;
             if(this.rotateStage) {
-                selectedElements = [this.application.ninja.currentDocument.documentRoot];
+                selectedElements = [this.application.ninja.currentDocument.model.documentRoot];
             }
 
                         this._mouseDownHitRec = null;
@@ -225,7 +225,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 
             var selectedElements = this.application.ninja.selectedElements;
             if(this.rotateStage) {
-                selectedElements = [this.application.ninja.currentDocument.documentRoot];
+                selectedElements = [this.application.ninja.currentDocument.model.documentRoot];
             }
 
             if(this._handleMode !== null)
@@ -345,7 +345,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
             var selectedElements = this.application.ninja.selectedElements;
 
             if(this.rotateStage) {
-                selectedElements = [this.application.ninja.currentDocument.documentRoot];
+                selectedElements = [this.application.ninja.currentDocument.model.documentRoot];
             }
             var len = selectedElements.length;
             for(var i = 0; i < len; i++) {
@@ -481,7 +481,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 }
                 else
                 {
-                    this.target = this.application.ninja.currentDocument.documentRoot;
+                    this.target = this.application.ninja.currentDocument.model.documentRoot;
                     //this._origin = drawUtils._selectionCtr.slice(0);
                     //this._origin[0] += this.application.ninja.stage.userContentLeft;
                     //this._origin[1] += this.application.ninja.stage.userContentTop;
@@ -609,7 +609,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 
             if(this.rotateStage || (this.application.ninja.selectedElements.length === 1)) {
                                 if(this.rotateStage) {
-                        element = this.application.ninja.currentDocument.documentRoot;
+                        element = this.application.ninja.currentDocument.model.documentRoot;
                 } else {
                     element = this.application.ninja.selectedElements[0];
                 }
@@ -851,7 +851,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
             else
             {
                 lMode = false;
-                viewUtils.pushViewportObj( this.application.ninja.currentDocument.documentRoot );
+                viewUtils.pushViewportObj( this.application.ninja.currentDocument.model.documentRoot );
             }
             var base = this._origin;
                         //console.log( "Rotate3DToolBase.DrawHandles, base: " + base );
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index c8818021..12b21a64 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -90,7 +90,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             this._origin = null;
             this._startOriginArray = null;
 
-            var stage = this.application.ninja.currentDocument.documentRoot;
+            var stage = this.application.ninja.currentDocument.model.documentRoot;
             this.target = stage;
 
             viewUtils.pushViewportObj( stage );
@@ -119,7 +119,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
 
     captureElementChange: {
         value: function(event) {
-            if(event._event.item === this.application.ninja.currentDocument.documentRoot)
+            if(event._event.item === this.application.ninja.currentDocument.model.documentRoot)
             {
                 this.captureSelectionDrawn(null);
             }
@@ -130,20 +130,22 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
        value : function()
        {
            // Reset stage to identity matrix
-           var iMat = Matrix.I(4);
+           var iMat = Matrix.I(4),
+               stage = this.application.ninja.stage;
 
-           ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot,
+           ElementsMediator.setMatrix(this.application.ninja.currentDocument.model.documentRoot,
                                         iMat, false, "rotateStage3DTool");
-           this.application.ninja.currentDocument.documentRoot.elementModel.props3D.m_transformCtr = null;
+           this.application.ninja.currentDocument.model.documentRoot.elementModel.props3D.m_transformCtr = null;
 
                         // let the document and stage manager know about the zoom change
-                        this.application.ninja.stage._firstDraw = true;
+                        stage._firstDraw = true;
                         this.application.ninja.documentBar.zoomFactor = 100;
             this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0;
-                        this.application.ninja.stage._firstDraw = false;
+                        stage._firstDraw = false;
 
-           // TODO - Any updates to the stage should redraw stage's children. Move this to mediator?
-           this.application.ninja.stage.updatedStage = true;
+           viewUtils.clearStageTranslation();
+           stage.centerStage();
+           stage.draw();