diff options
author | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
commit | 6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch) | |
tree | 377cd68e0580172bc234059dbd4482c964d49bd4 /js/tools/drawing-tool.js | |
parent | 79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff) | |
parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
download | ninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/tools/drawing-tool.js')
-rwxr-xr-x | js/tools/drawing-tool.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/tools/drawing-tool.js b/js/tools/drawing-tool.js index d906fdf9..9ba4501c 100755 --- a/js/tools/drawing-tool.js +++ b/js/tools/drawing-tool.js | |||
@@ -64,6 +64,8 @@ exports.DrawingTool = Montage.create(ToolBase, { | |||
64 | set: function (value) { this._currentY = value; } | 64 | set: function (value) { this._currentY = value; } |
65 | }, | 65 | }, |
66 | 66 | ||
67 | drawData: { value: null }, | ||
68 | |||
67 | /** | 69 | /** |
68 | * PUBLIC METHODS | 70 | * PUBLIC METHODS |
69 | */ | 71 | */ |
@@ -74,6 +76,7 @@ exports.DrawingTool = Montage.create(ToolBase, { | |||
74 | this._isDrawing = true; | 76 | this._isDrawing = true; |
75 | this.mouseDownHitRec = null; | 77 | this.mouseDownHitRec = null; |
76 | this.mouseUpHitRec = null; | 78 | this.mouseUpHitRec = null; |
79 | this.drawData = null; | ||
77 | 80 | ||
78 | point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); | 81 | point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); |
79 | snapData = DrawingToolBase.getInitialSnapPoint(point.x, point.y, this._targetedElement); //event.layerX, event.layerY); | 82 | snapData = DrawingToolBase.getInitialSnapPoint(point.x, point.y, this._targetedElement); //event.layerX, event.layerY); |