aboutsummaryrefslogtreecommitdiff
path: root/js/stage/tool-handle.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 12:20:03 -0700
committerPushkar Joshi2012-05-31 12:20:03 -0700
commit4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch)
treec5b17297aba04bd54a59cf6214d29486e089031b /js/stage/tool-handle.js
parent75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/stage/tool-handle.js')
-rwxr-xr-xjs/stage/tool-handle.js4
1 files changed, 2 insertions, 2 deletions
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, {
243 this._origin = pointOnElt; 243 this._origin = pointOnElt;
244 244
245 245
246 var viewMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.documentRoot); 246 var viewMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.model.documentRoot);
247 247
248 var transMat = viewMat.slice(0); 248 var transMat = viewMat.slice(0);
249 if(inLocalMode) 249 if(inLocalMode)
@@ -585,7 +585,7 @@ exports.TranslateHandle = Montage.create(ToolHandle, {
585 this._origin = pointOnElt; 585 this._origin = pointOnElt;
586 586
587 587
588 var stage = this.application.ninja.currentDocument.documentRoot; 588 var stage = this.application.ninja.currentDocument.model.documentRoot;
589 var viewMat = viewUtils.getMatrixFromElement(stage); 589 var viewMat = viewUtils.getMatrixFromElement(stage);
590 // Get viewMat without zoom value 590 // Get viewMat without zoom value
591 var zoom = this.application.ninja.documentBar.zoomFactor/100; 591 var zoom = this.application.ninja.documentBar.zoomFactor/100;