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

1 files changed, 11 insertions, 9 deletions

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();
 
            this.isDrawing = false;
            this.endDraw(event);