aboutsummaryrefslogtreecommitdiff
path: root/js/stage/tool-handle.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-24 13:54:00 -0700
committerNivesh Rajbhandari2012-05-24 13:54:00 -0700
commitfd4af6d81725dfa0630ac5e52ba95405336f4074 (patch)
tree868197f79862e98b9c7f5a1f296d64832c68d48f /js/stage/tool-handle.js
parentde25d2b7d05476d4f0d385b5e910db189f682d21 (diff)
parent70ff8dd670bc37c14caf850e06791d1e293b1e4b (diff)
downloadninja-fd4af6d81725dfa0630ac5e52ba95405336f4074.tar.gz
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
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;