Merge branch 'refs/heads/NiveshColor' into ToolFixes

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 042ba0b2..a0d5a182 100644
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -225,6 +225,10 @@ exports.LineTool = Montage.create(ShapeTool, {
                 canvas.elementModel.pi = "LinePi";
                 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
                 canvas.elementModel.shapeModel.stroke = strokeColor;
+                if(strokeColor)
+                {
+                    canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                }
 
                 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
                 canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;