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/OvalTool.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/OvalTool.js')
-rwxr-xr-x | js/tools/OvalTool.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js index ce812398..33bf763d 100755 --- a/js/tools/OvalTool.js +++ b/js/tools/OvalTool.js | |||
@@ -94,6 +94,9 @@ exports.OvalTool = Montage.create(ShapeTool, { | |||
94 | // TODO - update the shape's info only. shapeModel will likely need an array of shapes. | 94 | // TODO - update the shape's info only. shapeModel will likely need an array of shapes. |
95 | } | 95 | } |
96 | 96 | ||
97 | // TODO - This needs to be moved into geom obj's init routine instead of here | ||
98 | this.setColor(this.options.stroke, this.options.fill, canvas, "ovalTool"); | ||
99 | |||
97 | if(canvas.elementModel.isShape) | 100 | if(canvas.elementModel.isShape) |
98 | { | 101 | { |
99 | this.application.ninja.selectionController.selectElement(canvas); | 102 | this.application.ninja.selectionController.selectElement(canvas); |