aboutsummaryrefslogtreecommitdiff
path: root/js/tools/LineTool.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-06 14:36:51 -0800
committerValerio Virgillito2012-02-06 14:36:51 -0800
commit191898aaa63b357b5709b94cd38e15a258a9d95f (patch)
tree7fa44f2ec5042b942f37151bbfb67f875680f040 /js/tools/LineTool.js
parent08eafdff4ec25d34e2e76b386145a9fd122431dc (diff)
parent07e5839e0ec6da2eb71056ff18b90226af213eef (diff)
downloadninja-191898aaa63b357b5709b94cd38e15a258a9d95f.tar.gz
Merge branch 'master' into components
Diffstat (limited to 'js/tools/LineTool.js')
-rw-r--r--js/tools/LineTool.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 042ba0b2..17157f23 100644
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -99,6 +99,7 @@ exports.LineTool = Montage.create(ShapeTool, {
99 } 99 }
100 this.RenderShape(w, h, drawData.planeMat, drawData.midPt, 100 this.RenderShape(w, h, drawData.planeMat, drawData.midPt,
101 canvas, slope, xAdj, yAdj); 101 canvas, slope, xAdj, yAdj);
102 NJevent("elementAdded", canvas);
102 } 103 }
103 104
104 this.endDraw(event); 105 this.endDraw(event);
@@ -225,6 +226,10 @@ exports.LineTool = Montage.create(ShapeTool, {
225 canvas.elementModel.pi = "LinePi"; 226 canvas.elementModel.pi = "LinePi";
226 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; 227 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
227 canvas.elementModel.shapeModel.stroke = strokeColor; 228 canvas.elementModel.shapeModel.stroke = strokeColor;
229 if(strokeColor)
230 {
231 canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
232 }
228 233
229 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial; 234 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
230 canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex; 235 canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;