diff options
author | Ananya Sen | 2012-06-28 15:19:28 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-28 15:19:28 -0700 |
commit | 624acffc0619d879deaa6dcd8ce3c0cfeaf2227a (patch) | |
tree | ca53a666a93f9bed8912a5c3211ba84fc603c58f /js/tools/RectTool.js | |
parent | e4d3e040e521648ec9a6d0e0db2e62754f2d8882 (diff) | |
parent | 3ba9accb8e1887bfd6f1f912b6135073a3d9c70c (diff) | |
download | ninja-624acffc0619d879deaa6dcd8ce3c0cfeaf2227a.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Diffstat (limited to 'js/tools/RectTool.js')
-rwxr-xr-x | js/tools/RectTool.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js index b35a101a..df049395 100755 --- a/js/tools/RectTool.js +++ b/js/tools/RectTool.js | |||
@@ -117,6 +117,9 @@ exports.RectTool = Montage.create(ShapeTool, { | |||
117 | // TODO - update the shape's info only. shapeModel will likely need an array of shapes. | 117 | // TODO - update the shape's info only. shapeModel will likely need an array of shapes. |
118 | } | 118 | } |
119 | 119 | ||
120 | // TODO - This needs to be moved into geom obj's init routine instead of here | ||
121 | this.setColor(this.options.stroke, this.options.fill, canvas, "rectTool"); | ||
122 | |||
120 | if(canvas.elementModel.isShape) | 123 | if(canvas.elementModel.isShape) |
121 | { | 124 | { |
122 | this.application.ninja.selectionController.selectElement(canvas); | 125 | this.application.ninja.selectionController.selectElement(canvas); |