aboutsummaryrefslogtreecommitdiff
path: root/js/tools/drawing-tool.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/tools/drawing-tool.js')
-rwxr-xr-xjs/tools/drawing-tool.js35
1 files changed, 18 insertions, 17 deletions
diff --git a/js/tools/drawing-tool.js b/js/tools/drawing-tool.js
index 0cbb924f..4859620b 100755
--- a/js/tools/drawing-tool.js
+++ b/js/tools/drawing-tool.js
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, 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
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -118,7 +119,7 @@ exports.DrawingTool = Montage.create(ToolBase, {
118 value: function (event) { 119 value: function (event) {
119 var point; 120 var point;
120 point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); 121 point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
121 122
122 if (this.drawingFeedback.mode === "Draw3D") { 123 if (this.drawingFeedback.mode === "Draw3D") {
123 var do3DSnap; 124 var do3DSnap;
124 this.application.ninja.stage.clearDrawingCanvas(); 125 this.application.ninja.stage.clearDrawingCanvas();
@@ -151,15 +152,15 @@ exports.DrawingTool = Montage.create(ToolBase, {
151 this._currentDY = point.y - this._currentY; 152 this._currentDY = point.y - this._currentY;
152 153
153 this.downPoint.x += this._currentDX; 154 this.downPoint.x += this._currentDX;
154 this.downPoint.y += this._currentDY; 155 this.downPoint.y += this._currentDY;
155 this.currentX += this._currentDX; 156 this.currentX += this._currentDX;
156 this.currentY += this._currentDY; 157 this.currentY += this._currentDY;
157 158
158 DrawingToolBase.draw2DRectangle(this.downPoint.x,this.downPoint.y,this.currentX - this.downPoint.x,this.currentY - this.downPoint.y); 159 DrawingToolBase.draw2DRectangle(this.downPoint.x,this.downPoint.y,this.currentX - this.downPoint.x,this.currentY - this.downPoint.y);
159 } else { 160 } else {
160 this._currentX = point.x; 161 this._currentX = point.x;
161 this._currentY = point.y; 162 this._currentY = point.y;
162 163
163 DrawingToolBase.draw2DRectangle(this.downPoint.x,this.downPoint.y,point.x - this.downPoint.x,point.y - this.downPoint.y); 164 DrawingToolBase.draw2DRectangle(this.downPoint.x,this.downPoint.y,point.x - this.downPoint.x,point.y - this.downPoint.y);
164 } 165 }
165 166
@@ -233,7 +234,7 @@ exports.DrawingTool = Montage.create(ToolBase, {
233 return DrawingToolBase.getHitRecPos(this.mouseUpHitRec); 234 return DrawingToolBase.getHitRecPos(this.mouseUpHitRec);
234 } 235 }
235 }, 236 },
236 237
237 getDrawingData: { 238 getDrawingData: {
238 value: function (event) { 239 value: function (event) {
239 return DrawingToolBase.getCompletePoints(this.mouseDownHitRec, this.mouseUpHitRec); 240 return DrawingToolBase.getCompletePoints(this.mouseDownHitRec, this.mouseUpHitRec);