6 files changed, 62 insertions, 30 deletions

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 477966da..fabcec69 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -54,10 +54,24 @@ exports.FillTool = Montage.create(ModifierToolBase, {
         value: function(event) {
             this.isDrawing = true;
 
-            if(this._canColor)
+            if(this._canColor && this.application.ninja.selectedElements.length)
             {
-                var color = this.application.ninja.colorController.colorToolbar.fill;
-                ElementsMediator.setColor(this.application.ninja.selectedElements, color, true, "Change", "fillTool");
+                var color = this.application.ninja.colorController.colorToolbar.fill,
+                    colorInfo;
+                if(color && color.color)
+                {
+                    colorInfo = { mode:color.colorMode,
+                                       color:color.color
+                                    };
+                    ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
+                }
+                else
+                {
+                    colorInfo = { mode:"nocolor",
+                                       color:color.color
+                                    };
+                    ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
+                }
             }
         }
     }
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 042ba0b2..99c374a7 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -99,6 +99,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                 }
                 this.RenderShape(w, h, drawData.planeMat, drawData.midPt,
                                     canvas, slope, xAdj, yAdj);
+                NJevent("elementAdded", canvas);
             }
 
             this.endDraw(event);
@@ -202,10 +203,10 @@ exports.LineTool = Montage.create(ShapeTool, {
             // for default stroke and fill/no materials
             var strokeMaterial = null;
 
-            var strokeIndex = parseInt(this.options.strokeMaterial);
-            if(strokeIndex > 0)
+            var strokeM = this.options.strokeMaterial;
+            if(strokeM)
             {
-                strokeMaterial = Object.create(MaterialsLibrary.getMaterialAt(strokeIndex-1));
+                strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
@@ -225,14 +226,18 @@ 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;
 
                 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
                 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
 
                 canvas.elementModel.shapeModel.GLGeomObj = line;
+                canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
             }
             else
             {
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index e0f1f03f..14655312 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -43,16 +43,16 @@ exports.OvalTool = Montage.create(ShapeTool, {
             var strokeMaterial = null;
             var fillMaterial = null;
 
-            var strokeIndex = parseInt(this.options.strokeMaterial);
-            if(strokeIndex > 0)
+            var strokeM = this.options.strokeMaterial;
+            if(strokeM)
             {
-                strokeMaterial = Object.create(MaterialsLibrary.getMaterialAt(strokeIndex-1));
+                strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
             }
 
-            var fillIndex = parseInt(this.options.fillMaterial);
-            if(fillIndex > 0)
+            var fillM = this.options.fillMaterial;
+            if(fillM)
             {
-                fillMaterial = Object.create(MaterialsLibrary.getMaterialAt(fillIndex-1));
+                fillMaterial = Object.create(MaterialsLibrary.getMaterial(fillM));
             }
 
 
@@ -75,18 +75,25 @@ exports.OvalTool = Montage.create(ShapeTool, {
                 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
                 canvas.elementModel.shapeModel.stroke = strokeColor;
                 canvas.elementModel.shapeModel.fill = fillColor;
+                if(strokeColor)
+                {
+                    canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                }
+                if(fillColor)
+                {
+                    canvas.elementModel.shapeModel.background = this.application.ninja.colorController.colorToolbar.fill;
+                }
 
                 canvas.elementModel.shapeModel.innerRadius = this.options.innerRadius.value  + " " + this.options.innerRadius.units;
 
                 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
                 canvas.elementModel.shapeModel.fillMaterial = fillMaterial;
-                canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;
-                canvas.elementModel.shapeModel.fillMaterialIndex = fillIndex;
 
                 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
                 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
 
                 canvas.elementModel.shapeModel.GLGeomObj = oval;
+                canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
             }
             else
             {
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index fbf1693e..31ac7faa 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -62,16 +62,16 @@ exports.RectTool = Montage.create(ShapeTool, {
             var strokeMaterial = null;
             var fillMaterial = null;
 
-            var strokeIndex = parseInt(this.options.strokeMaterial);
-            if(strokeIndex > 0)
+            var strokeM = this.options.strokeMaterial;
+            if(strokeM)
             {
-                strokeMaterial = Object.create(MaterialsLibrary.getMaterialAt(strokeIndex-1));
+                strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
             }
 
-            var fillIndex = parseInt(this.options.fillMaterial);
-            if(fillIndex > 0)
+            var fillM = this.options.fillMaterial;
+            if(fillM)
             {
-                fillMaterial = Object.create(MaterialsLibrary.getMaterialAt(fillIndex-1));
+                fillMaterial = Object.create(MaterialsLibrary.getMaterial(fillM));
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
@@ -94,6 +94,14 @@ exports.RectTool = Montage.create(ShapeTool, {
                 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
                 canvas.elementModel.shapeModel.stroke = strokeColor;
                 canvas.elementModel.shapeModel.fill = fillColor;
+                if(strokeColor)
+                {
+                    canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                }
+                if(fillColor)
+                {
+                    canvas.elementModel.shapeModel.background = this.application.ninja.colorController.colorToolbar.fill;
+                }
 
                 canvas.elementModel.shapeModel.tlRadius = this.options.TLRadiusControl.value + " " + this.options.TLRadiusControl.units;
                 canvas.elementModel.shapeModel.trRadius = this.options.TRRadiusControl.value + " " + this.options.TRRadiusControl.units;
@@ -102,13 +110,12 @@ exports.RectTool = Montage.create(ShapeTool, {
 
                 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
                 canvas.elementModel.shapeModel.fillMaterial = fillMaterial;
-                canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;
-                canvas.elementModel.shapeModel.fillMaterialIndex = fillIndex;
 
                 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
                 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
 
                 canvas.elementModel.shapeModel.GLGeomObj = rect;
+                canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
             }
             else
             {
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 9a4399b4..4ccb7a8d 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -83,6 +83,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                     }
                 }
                 this.RenderShape(drawData.width, drawData.height, drawData.planeMat, drawData.midPt, canvas);
+                NJevent("elementAdded", canvas);
             }
 
                         this.endDraw(event);
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index c527edf3..e3f49bbe 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -158,19 +158,17 @@ exports.TagTool = Montage.create(DrawingTool, {