Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool

Conflicts:
	_scss/compass_app_log.txt
	css/ninja.css

1 files changed, 17 insertions, 3 deletions

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 477966da..fabcec69 100644
--- 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");
+                }
             }
         }
     }