diff options
| author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
| commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
| tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/tools/ShapeTool.js | |
| parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/tools/ShapeTool.js')
| -rwxr-xr-x | js/tools/ShapeTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index f3b5e92d..21a5a025 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
| @@ -138,7 +138,7 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
| 138 | _showFeedbackOnMouseMove: { | 138 | _showFeedbackOnMouseMove: { |
| 139 | value: function (event) { | 139 | value: function (event) { |
| 140 | // TODO - This call is causing the canvas to redraw 3 times per mouse move | 140 | // TODO - This call is causing the canvas to redraw 3 times per mouse move |
| 141 | var targetedObject = this.application.ninja.stage.GetSelectableElement(event); | 141 | var targetedObject = this.application.ninja.stage.getElement(event, true); |
| 142 | 142 | ||
| 143 | if (targetedObject) { | 143 | if (targetedObject) { |
| 144 | if((targetedObject.nodeName === "CANVAS") && !ShapesController.isElementAShape(targetedObject)) | 144 | if((targetedObject.nodeName === "CANVAS") && !ShapesController.isElementAShape(targetedObject)) |