diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/tools/drawing-tool.js | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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]; |