diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/tools/ToolBase.js | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/tools/ToolBase.js')
-rwxr-xr-x | js/tools/ToolBase.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js index 7f4b6f46..8cc77300 100755 --- a/js/tools/ToolBase.js +++ b/js/tools/ToolBase.js | |||
@@ -89,7 +89,7 @@ exports.toolBase = Montage.create(Component, { | |||
89 | HandleShiftKeyUp: { value : function () {} }, | 89 | HandleShiftKeyUp: { value : function () {} }, |
90 | HandleAltKeyDown: { value : function () {} }, | 90 | HandleAltKeyDown: { value : function () {} }, |
91 | HandleAltKeyUp: { value : function () {} }, | 91 | HandleAltKeyUp: { value : function () {} }, |
92 | 92 | ||
93 | HandleSpaceDown: { value: function() { this._isSpace = true; } }, | 93 | HandleSpaceDown: { value: function() { this._isSpace = true; } }, |
94 | HandleSpaceUp: { value: function() { this._isSpace = false; } }, | 94 | HandleSpaceUp: { value: function() { this._isSpace = false; } }, |
95 | 95 | ||
@@ -137,7 +137,7 @@ exports.toolBase = Montage.create(Component, { | |||
137 | 137 | ||
138 | previousZoomValue = this.application.ninja.documentBar.zoomFactor; | 138 | previousZoomValue = this.application.ninja.documentBar.zoomFactor; |
139 | upperBoundary = previousZoomValue *1.2 ; | 139 | upperBoundary = previousZoomValue *1.2 ; |
140 | 140 | ||
141 | if(upperBoundary > 2000) | 141 | if(upperBoundary > 2000) |
142 | this.application.ninja.documentBar.zoomFactor = 2000; | 142 | this.application.ninja.documentBar.zoomFactor = 2000; |
143 | else | 143 | else |
@@ -149,7 +149,7 @@ exports.toolBase = Montage.create(Component, { | |||
149 | zoomOut:{ | 149 | zoomOut:{ |
150 | value:function(){ | 150 | value:function(){ |
151 | var lowerBoundary ,previousZoomValue; | 151 | var lowerBoundary ,previousZoomValue; |
152 | 152 | ||
153 | previousZoomValue = this.application.ninja.documentBar.zoomFactor ; | 153 | previousZoomValue = this.application.ninja.documentBar.zoomFactor ; |
154 | lowerBoundary = previousZoomValue/1.2 ; | 154 | lowerBoundary = previousZoomValue/1.2 ; |
155 | 155 | ||
@@ -178,7 +178,7 @@ exports.toolBase = Montage.create(Component, { | |||
178 | 178 | ||
179 | // if (drawUtils.isDrawingGrid()) | 179 | // if (drawUtils.isDrawingGrid()) |
180 | // { | 180 | // { |
181 | // snapManager.updateWorkingPlaneFromView(); | 181 | // snapManager.updateWorkingPlaneFromView(); |
182 | // } | 182 | // } |
183 | } | 183 | } |
184 | }, | 184 | }, |