aboutsummaryrefslogtreecommitdiff
path: root/js/tools/PenTool.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-07 10:38:04 -0700
committerJose Antonio Marquez2012-05-07 10:38:04 -0700
commit5293ede5f3493900df93da33197416d853f8d907 (patch)
tree3155deaea5616fa09fc96c84567419fec5f288a2 /js/tools/PenTool.js
parent9c0bda09a502472768f6dd5090a882d11be58d23 (diff)
parent30e837ade2da7cb20caf7c5a69faf0888736bb9a (diff)
downloadninja-5293ede5f3493900df93da33197416d853f8d907.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/tools/PenTool.js')
-rwxr-xr-xjs/tools/PenTool.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 8ecc9f79..16990ca7 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -557,17 +557,16 @@ exports.PenTool = Montage.create(ShapeTool, {
557 return; 557 return;
558 } 558 }
559 559
560 w= Math.round(w); 560 w = Math.round(w);
561 h = Math.round(h); 561 h = Math.round(h);
562 var left = Math.round(midPt[0] - 0.5 * w); 562 var left = Math.round(midPt[0] - 0.5 * w);
563 var top = Math.round(midPt[1] - 0.5 * h); 563 var top = Math.round(midPt[1] - 0.5 * h);
564 564
565 if (!canvas) { 565 if (!canvas) {
566 var newCanvas = null; 566 var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
567 newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); 567 document.application.njUtils.createModelWithShape(newCanvas, "Subpath");
568 var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, true); 568 var styles = document.application.njUtils.stylesFromDraw(newCanvas, parseInt(w), parseInt(h), {midPt: midPt, planeMat: planeMat});
569 //note that we set the notify event to false because we send the event separately at end of this code block 569 this.application.ninja.elementMediator.addElements(newCanvas, styles, false);
570 ElementMediator.addElements(newCanvas, elementModel.data, false);
571 570
572 // create all the GL stuff 571 // create all the GL stuff
573 var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial); 572 var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial);