put color chips in the inkbottle and fill tool

3 files changed, 5 insertions, 6 deletions

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 87a093ff..66dd9305 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -72,9 +72,9 @@ exports.FillTool = Montage.create(ModifierToolBase, {
         value: function(event) {
             this.isDrawing = true;
 
-            if(this._canColor && this.application.ninja.selectedElements.length)
-            {
-                var color = this.application.ninja.colorController.colorToolbar.fill,
+            if(this._canColor && this.application.ninja.selectedElements.length) {
+
+                var color = this.options.fill,
                     colorInfo;
                 if(color && color.color)
                 {
@@ -92,5 +92,4 @@ exports.FillTool = Montage.create(ModifierToolBase, {
             }
         }
     }
-
 });
\ No newline at end of file
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index fd17f4d6..2c03d133 100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -69,7 +69,7 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
 
             if(this._canColor && this.application.ninja.selectedElements.length)
             {
-                var color = this.application.ninja.colorController.colorToolbar.stroke,
+                var color = this.options.stroke,
                     colorInfo;
                 if(color && color.color)
                 {
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index e70bed27..10eb03c9 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -592,7 +592,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                     var strokeColor = subpath.getStrokeColor();
                     newCanvas.elementModel.shapeModel.stroke = strokeColor;
                     if(strokeColor) {
-                        newCanvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                        newCanvas.elementModel.shapeModel.border = this.options.stroke;
                     }
                     newCanvas.elementModel.shapeModel.GLGeomObj = subpath;
                     newCanvas.elementModel.shapeModel.useWebGl = false;//this.options.use3D;