Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 24 insertions, 11 deletions

diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index cc20d94c..2be74ada 100644..100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -48,20 +48,33 @@ exports.InkBottleTool = 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.stroke;
-//                ElementsMediator.setColor(this.application.ninja.selectedElements, color, false, "Change", "inkBottleTool");
+                var color = this.application.ninja.colorController.colorToolbar.stroke,
+                    colorInfo;
+                if(color && color.color)
+                {
+                    colorInfo = { mode:color.colorMode,
+                                   color:color.color
+                                };
+                }
+                else
+                {
+                    colorInfo = { mode:"nocolor",
+                                   color:color.color
+                                };
+                }
+
+                colorInfo.borderInfo = { borderStyle:this.options._borderStyle.value,
+                                         borderWidth:this.options._borderWidth.value,
+                                         borderUnits:this.options._borderWidth.units
+                                       };
 
-                var strokeInfo = {  borderStyle:this.options._borderStyle.value,
-                                    borderWidth:this.options._borderWidth.value,
-                                    borderUnits:this.options._borderWidth.units,
-                                    strokeSize:this.options._strokeSize.value,
-                                    strokeUnits:this.options._strokeSize.units,
-                                    color:this.application.ninja.colorController.colorToolbar.stroke
-                                 };
+                colorInfo.strokeInfo = { strokeSize:this.options._strokeSize.value,
+                                         strokeUnits:this.options._strokeSize.units
+                                       };
 
-                ElementsMediator.setStroke(this.application.ninja.selectedElements, strokeInfo, "Change", "inkBottleTool");
+                ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, false, "Change", "inkBottleTool");
             }
         }
     }