diff options
author | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
commit | 4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch) | |
tree | c5b17297aba04bd54a59cf6214d29486e089031b /js/tools/ZoomTool.js | |
parent | 75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/tools/ZoomTool.js')
-rwxr-xr-x | js/tools/ZoomTool.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/tools/ZoomTool.js b/js/tools/ZoomTool.js index 93caf984..dc096592 100755 --- a/js/tools/ZoomTool.js +++ b/js/tools/ZoomTool.js | |||
@@ -184,7 +184,7 @@ exports.ZoomTool = Montage.create(DrawingTool, { | |||
184 | _setZoom:{ | 184 | _setZoom:{ |
185 | value:function(mode,zoomFactor) | 185 | value:function(mode,zoomFactor) |
186 | { | 186 | { |
187 | var userContent = this.application.ninja.currentDocument.documentRoot; | 187 | var userContent = this.application.ninja.currentDocument.model.documentRoot; |
188 | this._oldValue = this.application.ninja.documentBar.zoomFactor; | 188 | this._oldValue = this.application.ninja.documentBar.zoomFactor; |
189 | 189 | ||
190 | var globalPt; | 190 | var globalPt; |
@@ -280,7 +280,9 @@ exports.ZoomTool = Montage.create(DrawingTool, { | |||
280 | this.application.ninja.documentBar.zoomFactor = zoomFactor*100; | 280 | this.application.ninja.documentBar.zoomFactor = zoomFactor*100; |
281 | //this.application.ninja.stage.zoomFactor = zoomFactor; | 281 | //this.application.ninja.stage.zoomFactor = zoomFactor; |
282 | if (zoomFactor >= 1) | 282 | if (zoomFactor >= 1) |
283 | this.application.ninja.currentDocument.iframe.style.zoom = zoomFactor; | 283 | { |
284 | this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = zoomFactor; | ||
285 | } | ||
284 | this.application.ninja.stage._firstDraw = false; | 286 | this.application.ninja.stage._firstDraw = false; |
285 | //tmp3 = viewUtils.localToGlobal( localPt, userContent ); // DEBUG - remove this line | 287 | //tmp3 = viewUtils.localToGlobal( localPt, userContent ); // DEBUG - remove this line |
286 | 288 | ||