diff options
author | Armen Kesablyan | 2012-05-25 11:22:58 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-25 11:22:58 -0700 |
commit | 81239571c538f72e398fafa5b07725bf1bbb2d5d (patch) | |
tree | d31c876f5af61565eff8c934c9e5f119696d46e0 /js/stage/tool-handle.js | |
parent | e8c4e98c24092a360eb2f637983fd104fbb67f66 (diff) | |
parent | 9c8d724dd1605ee2e5257591e0bfaad575cbc906 (diff) | |
download | ninja-81239571c538f72e398fafa5b07725bf1bbb2d5d.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Diffstat (limited to 'js/stage/tool-handle.js')
-rwxr-xr-x | js/stage/tool-handle.js | 4 |
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; |