aboutsummaryrefslogtreecommitdiff
path: root/js/tools/drawing-tool.js
diff options
context:
space:
mode:
authorJon Reid2012-05-04 14:56:24 -0700
committerJon Reid2012-05-04 14:56:24 -0700
commita6dd2917edcfeca1be7553e03281ddd538422ae1 (patch)
treee6846626bf1e967e80bcd652f6a76bb97abb1789 /js/tools/drawing-tool.js
parent7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf (diff)
parent8964e070fa760d23c2de272ca36b8d9beba6007d (diff)
downloadninja-a6dd2917edcfeca1be7553e03281ddd538422ae1.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/tools/drawing-tool.js')
-rwxr-xr-xjs/tools/drawing-tool.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/tools/drawing-tool.js b/js/tools/drawing-tool.js
index dc5f7996..d906fdf9 100755
--- a/js/tools/drawing-tool.js
+++ b/js/tools/drawing-tool.js
@@ -72,10 +72,11 @@ exports.DrawingTool = Montage.create(ToolBase, {
72 var snapData, point; 72 var snapData, point;
73 73
74 this._isDrawing = true; 74 this._isDrawing = true;
75 this.mouseDownHitRec = null;
75 this.mouseUpHitRec = null; 76 this.mouseUpHitRec = null;
76 77
77 point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); 78 point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
78 snapData = DrawingToolBase.getInitialSnapPoint(point.x, point.y); //event.layerX, event.layerY); 79 snapData = DrawingToolBase.getInitialSnapPoint(point.x, point.y, this._targetedElement); //event.layerX, event.layerY);
79 this.mouseDownHitRec = snapData[0]; 80 this.mouseDownHitRec = snapData[0];
80 this.downPoint.x = snapData[1]; 81 this.downPoint.x = snapData[1];
81 this.downPoint.y = snapData[2]; 82 this.downPoint.y = snapData[2];