From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 js/tools/FillTool.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 js/tools/FillTool.js

(limited to 'js/tools/FillTool.js')

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 2edf68e0de786cdc92d5f41548fd61e6c77a57ec Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 13 Feb 2012 09:56:40 -0800
Subject: Updated ink bottle tool to use new setColor routine in the mediator
 and controllers.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/tools/FillTool.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'js/tools/FillTool.js')

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index fabcec69..46d76a19 100644
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -63,15 +63,14 @@ exports.FillTool = Montage.create(ModifierToolBase, {
                     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");
                 }
+                ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
             }
         }
     }
-- 
cgit v1.2.3