diff options
author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /js/tools/ShapeTool.js | |
parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
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 0562dbc2..367ab78d 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -72,7 +72,7 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
72 | if(!canvas.elementModel.shapeModel) { | 72 | if(!canvas.elementModel.shapeModel) { |
73 | canvas.elementModel.shapeModel = Montage.create(ShapeModel); | 73 | canvas.elementModel.shapeModel = Montage.create(ShapeModel); |
74 | } | 74 | } |
75 | this.application.ninja.elementMediator.addElements(canvas, canvas.elementModel.data); | 75 | this.RenderShape(drawData.width, drawData.height, drawData.planeMat, drawData.midPt, canvas); |
76 | } | 76 | } |
77 | } | 77 | } |
78 | 78 | ||