aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ShapeTool.js
diff options
context:
space:
mode:
authorKruti Shah2012-06-12 13:09:11 -0700
committerKruti Shah2012-06-12 13:09:11 -0700
commitd648c842905c7c53e0f89b943982493d2b79f56e (patch)
treeeb5585f92061975215f6d19305a8d1b76262e2fc /js/tools/ShapeTool.js
parentbedb38e14887b29eae3cdf1c8d435259c920257c (diff)
parentcf3b96822665751dae7a64644db3cb3960733c3d (diff)
downloadninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/tools/ShapeTool.js')
-rwxr-xr-xjs/tools/ShapeTool.js45
1 files changed, 24 insertions, 21 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 367ab78d..03ddc391 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -55,24 +55,29 @@ exports.ShapeTool = Montage.create(DrawingTool, {
55 55
56 HandleLeftButtonUp: { 56 HandleLeftButtonUp: {
57 value: function (event) { 57 value: function (event) {
58 var canvas, drawData = this.getDrawingData(); 58 var canvas, w, h;
59 59 this.drawData = this.getDrawingData();
60 if(drawData) { 60
61 if(!this._useExistingCanvas()) { 61 if(this.drawData) {
62 canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); 62 w = Math.floor(this.drawData.width);
63 document.application.njUtils.createModelWithShape(canvas); 63 h = Math.floor(this.drawData.height);
64 64
65 var styles = document.application.njUtils.stylesFromDraw(canvas, ~~drawData.width, ~~drawData.height, drawData); 65 if( (w > 0) && (h > 0) ) {
66 this.application.ninja.elementMediator.addElements(canvas, styles); 66 if(!this._useExistingCanvas()) {
67 } else { 67 canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
68 canvas = this._targetedElement; 68
69 if (!canvas.getAttribute( "data-RDGE-id" )) 69 var styles = document.application.njUtils.stylesFromDraw(canvas, w, h, this.drawData);
70 canvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() ); 70 this.application.ninja.elementMediator.addElements(canvas, styles);
71 canvas.elementModel.controller = ShapesController; 71 } else {
72 if(!canvas.elementModel.shapeModel) { 72 canvas = this._targetedElement;
73 canvas.elementModel.shapeModel = Montage.create(ShapeModel); 73 if (!canvas.getAttribute( "data-RDGE-id" ))
74 canvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() );
75 canvas.elementModel.controller = ShapesController;
76 if(!canvas.elementModel.shapeModel) {
77 canvas.elementModel.shapeModel = Montage.create(ShapeModel);
78 }
79 this.RenderShape(w, h, this.drawData.planeMat, this.drawData.midPt, canvas);
74 } 80 }
75 this.RenderShape(drawData.width, drawData.height, drawData.planeMat, drawData.midPt, canvas);
76 } 81 }
77 } 82 }
78 83
@@ -87,10 +92,8 @@ exports.ShapeTool = Montage.create(DrawingTool, {
87 92
88 onAddElements: { 93 onAddElements: {
89 value: function(el) { 94 value: function(el) {
90 var drawData; 95 if(this.drawData) {
91 96 this.RenderShape(this.drawData.width, this.drawData.height, this.drawData.planeMat, this.drawData.midPt, el);
92 if(drawData = this.getDrawingData()) {
93 this.RenderShape(drawData.width, drawData.height, drawData.planeMat, drawData.midPt, el);
94 } 97 }
95 } 98 }
96 }, 99 },