diff options
Diffstat (limited to 'js/tools/ToolBase.js')
-rwxr-xr-x | js/tools/ToolBase.js | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js index 7f4b6f46..e0878c5d 100755 --- a/js/tools/ToolBase.js +++ b/js/tools/ToolBase.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -89,7 +90,7 @@ exports.toolBase = Montage.create(Component, { | |||
89 | HandleShiftKeyUp: { value : function () {} }, | 90 | HandleShiftKeyUp: { value : function () {} }, |
90 | HandleAltKeyDown: { value : function () {} }, | 91 | HandleAltKeyDown: { value : function () {} }, |
91 | HandleAltKeyUp: { value : function () {} }, | 92 | HandleAltKeyUp: { value : function () {} }, |
92 | 93 | ||
93 | HandleSpaceDown: { value: function() { this._isSpace = true; } }, | 94 | HandleSpaceDown: { value: function() { this._isSpace = true; } }, |
94 | HandleSpaceUp: { value: function() { this._isSpace = false; } }, | 95 | HandleSpaceUp: { value: function() { this._isSpace = false; } }, |
95 | 96 | ||
@@ -137,7 +138,7 @@ exports.toolBase = Montage.create(Component, { | |||
137 | 138 | ||
138 | previousZoomValue = this.application.ninja.documentBar.zoomFactor; | 139 | previousZoomValue = this.application.ninja.documentBar.zoomFactor; |
139 | upperBoundary = previousZoomValue *1.2 ; | 140 | upperBoundary = previousZoomValue *1.2 ; |
140 | 141 | ||
141 | if(upperBoundary > 2000) | 142 | if(upperBoundary > 2000) |
142 | this.application.ninja.documentBar.zoomFactor = 2000; | 143 | this.application.ninja.documentBar.zoomFactor = 2000; |
143 | else | 144 | else |
@@ -149,7 +150,7 @@ exports.toolBase = Montage.create(Component, { | |||
149 | zoomOut:{ | 150 | zoomOut:{ |
150 | value:function(){ | 151 | value:function(){ |
151 | var lowerBoundary ,previousZoomValue; | 152 | var lowerBoundary ,previousZoomValue; |
152 | 153 | ||
153 | previousZoomValue = this.application.ninja.documentBar.zoomFactor ; | 154 | previousZoomValue = this.application.ninja.documentBar.zoomFactor ; |
154 | lowerBoundary = previousZoomValue/1.2 ; | 155 | lowerBoundary = previousZoomValue/1.2 ; |
155 | 156 | ||
@@ -178,7 +179,7 @@ exports.toolBase = Montage.create(Component, { | |||
178 | 179 | ||
179 | // if (drawUtils.isDrawingGrid()) | 180 | // if (drawUtils.isDrawingGrid()) |
180 | // { | 181 | // { |
181 | // snapManager.updateWorkingPlaneFromView(); | 182 | // snapManager.updateWorkingPlaneFromView(); |
182 | // } | 183 | // } |
183 | } | 184 | } |
184 | }, | 185 | }, |