diff options
author | Valerio Virgillito | 2012-06-11 17:46:29 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-11 17:46:29 -0700 |
commit | b6c88f548c8d3756738e534418732710af733f03 (patch) | |
tree | d651ce2811019a3bccfd8be1326762cd2c601316 /js/tools/drawing-tool.js | |
parent | 91123fef348ec54d89005adbc151e816856a6a18 (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-b6c88f548c8d3756738e534418732710af733f03.tar.gz |
Merge branch 'refs/heads/master' into montage-v10-integration
Conflicts:
js/io/system/ninjalibrary.json
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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); |