aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ZoomTool.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 17:16:21 -0700
committerPushkar Joshi2012-05-31 17:16:21 -0700
commit8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch)
tree19a8af74c58c9ea261f0842f36efdab959be3256 /js/tools/ZoomTool.js
parenteea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff)
parent06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff)
downloadninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/tools/ZoomTool.js')
-rwxr-xr-xjs/tools/ZoomTool.js6
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