aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ToolBase.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-25 14:45:47 -0700
committerValerio Virgillito2012-04-25 14:45:47 -0700
commitbcc8f8616f5ad4bf310928da6cbc01da12f6e468 (patch)
tree9f3d5f6f4c429a1b4912e835e1cbdf704b59def5 /js/tools/ToolBase.js
parentd3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff)
parentd5510229ebd4549ce435e3947874cc37eef27ffb (diff)
downloadninja-bcc8f8616f5ad4bf310928da6cbc01da12f6e468.tar.gz
Merge pull request #175 from mqg734/BoundsCalculation
Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom.
Diffstat (limited to 'js/tools/ToolBase.js')
-rwxr-xr-xjs/tools/ToolBase.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js
index 678d03ac..69ac5727 100755
--- a/js/tools/ToolBase.js
+++ b/js/tools/ToolBase.js
@@ -109,13 +109,13 @@ exports.toolBase = Montage.create(Component, {
109 value:function(event){ 109 value:function(event){
110 var upperBoundary ,previousZoomValue; 110 var upperBoundary ,previousZoomValue;
111 111
112 previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ; 112 previousZoomValue = this.application.ninja.documentBar.zoomFactor;
113 upperBoundary = previousZoomValue *1.2 ; 113 upperBoundary = previousZoomValue *1.2 ;
114 114
115 if(upperBoundary > 2000) 115 if(upperBoundary > 2000)
116 this.application.Ninja._documentBarRef.zoomFactor = 2000; 116 this.application.ninja.documentBar.zoomFactor = 2000;
117 else 117 else
118 this.application.Ninja._documentBarRef.zoomFactor*= 1.2; 118 this.application.ninja.documentBar.zoomFactor*= 1.2;
119 119
120 } 120 }
121 }, 121 },
@@ -124,13 +124,13 @@ exports.toolBase = Montage.create(Component, {
124 value:function(){ 124 value:function(){
125 var lowerBoundary ,previousZoomValue; 125 var lowerBoundary ,previousZoomValue;
126 126
127 previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ; 127 previousZoomValue = this.application.ninja.documentBar.zoomFactor ;
128 lowerBoundary = previousZoomValue/1.2 ; 128 lowerBoundary = previousZoomValue/1.2 ;
129 129
130 if(lowerBoundary < 25) 130 if(lowerBoundary < 25)
131 this.application.Ninja._documentBarRef.zoomFactor = 25; 131 this.application.ninja.documentBar.zoomFactor = 25;
132 else 132 else
133 this.application.Ninja._documentBarRef.zoomFactor/= 1.2; 133 this.application.ninja.documentBar.zoomFactor/= 1.2;
134 } 134 }
135 }, 135 },
136 136