diff options
| author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
| commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
| tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/tools/modifier-tool-base.js | |
| parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/tools/modifier-tool-base.js')
| -rwxr-xr-x | js/tools/modifier-tool-base.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 6aea77aa..6c569f0a 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
| @@ -451,6 +451,8 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
| 451 | 451 | ||
| 452 | startDraw: { | 452 | startDraw: { |
| 453 | value: function(event) { | 453 | value: function(event) { |
| 454 | this.drawData = null; | ||
| 455 | |||
| 454 | if(this._target) | 456 | if(this._target) |
| 455 | { | 457 | { |
| 456 | this.isDrawing = true; | 458 | this.isDrawing = true; |