diff options
author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
tree | ceb527713554f506c537168e36a10452cd09ad10 /js/tools/drawing-tool.js | |
parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/tools/drawing-tool.js')
-rwxr-xr-x | js/tools/drawing-tool.js | 3 |
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]; |