aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ShapeTool.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-01 09:17:07 -0700
committerNivesh Rajbhandari2012-05-01 09:17:07 -0700
commit286836b141f14e45d74e70ee00ba129480d2fe7f (patch)
tree195a57f7fa1eb9c48fa5bcf779516cdc759b74c6 /js/tools/ShapeTool.js
parentc534f70e9af920d252d0d94151c9d6f884283b81 (diff)
parentfb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff)
downloadninja-286836b141f14e45d74e70ee00ba129480d2fe7f.tar.gz
Merge branch 'refs/heads/ninja-internal' into StageWebTemplate
Diffstat (limited to 'js/tools/ShapeTool.js')
-rwxr-xr-xjs/tools/ShapeTool.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index c0681200..8f45891d 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -64,7 +64,6 @@ exports.ShapeTool = Montage.create(DrawingTool, {
64 if(drawData) { 64 if(drawData) {
65 var canvas; 65 var canvas;
66 if(!this._useExistingCanvas()) { 66 if(!this._useExistingCanvas()) {
67 console.log( "creating a new canvas" );
68 canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); 67 canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
69 var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height, 68 var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height,
70 drawData.planeMat, drawData.midPt, canvas, true); 69 drawData.planeMat, drawData.midPt, canvas, true);
@@ -72,7 +71,6 @@ exports.ShapeTool = Montage.create(DrawingTool, {
72 canvas.elementModel.isShape = true; 71 canvas.elementModel.isShape = true;
73 this.application.ninja.elementMediator.addElements(canvas, elementModel.data); 72 this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
74 } else { 73 } else {
75 console.log( "inserting shape into container" );
76 canvas = this._targetedElement; 74 canvas = this._targetedElement;
77 if (!canvas.getAttribute( "data-RDGE-id" )) 75 if (!canvas.getAttribute( "data-RDGE-id" ))
78 canvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() ); 76 canvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() );