diff options
author | Valerio Virgillito | 2012-05-25 15:19:02 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-25 15:19:02 -0700 |
commit | 9a66ccad0235484643ef6d821315b11b5be4a93e (patch) | |
tree | 7b77a3027d5b11ddba51ed47faa1ee0b43c555fe | |
parent | 83fff4ad660e4c9ea82c234f051c58d96f84f3e3 (diff) | |
parent | 9c8d724dd1605ee2e5257591e0bfaad575cbc906 (diff) | |
download | ninja-9a66ccad0235484643ef6d821315b11b5be4a93e.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into dom-architecture
-rwxr-xr-x | js/tools/RotateStage3DTool.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js index 92ed40d2..12b21a64 100755 --- a/js/tools/RotateStage3DTool.js +++ b/js/tools/RotateStage3DTool.js | |||
@@ -130,20 +130,22 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
130 | value : function() | 130 | value : function() |
131 | { | 131 | { |
132 | // Reset stage to identity matrix | 132 | // Reset stage to identity matrix |
133 | var iMat = Matrix.I(4); | 133 | var iMat = Matrix.I(4), |
134 | stage = this.application.ninja.stage; | ||
134 | 135 | ||
135 | ElementsMediator.setMatrix(this.application.ninja.currentDocument.model.documentRoot, | 136 | ElementsMediator.setMatrix(this.application.ninja.currentDocument.model.documentRoot, |
136 | iMat, false, "rotateStage3DTool"); | 137 | iMat, false, "rotateStage3DTool"); |
137 | this.application.ninja.currentDocument.model.documentRoot.elementModel.props3D.m_transformCtr = null; | 138 | this.application.ninja.currentDocument.model.documentRoot.elementModel.props3D.m_transformCtr = null; |
138 | 139 | ||
139 | // let the document and stage manager know about the zoom change | 140 | // let the document and stage manager know about the zoom change |
140 | this.application.ninja.stage._firstDraw = true; | 141 | stage._firstDraw = true; |
141 | this.application.ninja.documentBar.zoomFactor = 100; | 142 | this.application.ninja.documentBar.zoomFactor = 100; |
142 | this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0; | 143 | this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0; |
143 | this.application.ninja.stage._firstDraw = false; | 144 | stage._firstDraw = false; |
144 | 145 | ||
145 | // TODO - Any updates to the stage should redraw stage's children. Move this to mediator? | 146 | viewUtils.clearStageTranslation(); |
146 | this.application.ninja.stage.updatedStage = true; | 147 | stage.centerStage(); |
148 | stage.draw(); | ||
147 | 149 | ||
148 | this.isDrawing = false; | 150 | this.isDrawing = false; |
149 | this.endDraw(event); | 151 | this.endDraw(event); |