Removed border special-casing from PI since the mediator now handles this generically. Updated mediator's set stroke routine to use the setColor routine.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

3 files changed, 20 insertions, 20 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 892ac2f2..9b13e703 100644
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -144,10 +144,6 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
                             this.setProperty(el, "background-color", color.color.css);
                     }
                 }
-                else
-                {
-                    this.application.ninja.stylesController.setElementStyle(el, "background-color", color.color.css);
-                }
                 el.elementModel.fill = color;
             }
             else
@@ -169,10 +165,6 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
                             this.setProperty(el, "border-color", color.color.css);
                     }
                 }
-                else
-                {
-                    this.application.ninja.stylesController.setElementStyle(el, "border-color", color.color.css);
-                }
                 el.elementModel.stroke = color;
             }
         }
@@ -187,8 +179,9 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
 
     setStroke: {
         value: function(el, stroke) {
-            var border = stroke.borderWidth + stroke.borderUnits + " " + stroke.borderStyle + " " + stroke.color.color.css;
-            this.application.ninja.stylesController.setElementStyle(el, "border", border);
+            this.application.ninja.stylesController.setElementStyle(el, "border-width", stroke.borderWidth + stroke.borderUnits);
+            this.application.ninja.stylesController.setElementStyle(el, "border-style", stroke.borderStyle);
+            this.setColor(el, stroke.color, false);
         }
     },
 
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 34c38e70..6cb66071 100644
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -198,7 +198,6 @@ exports.Content = Montage.create(Component, {
                                 this.application.ninja.colorController.colorModel.input = "fill";
                             }
 
-                            debugger;
                             if(currentValue)
                             {
                                 if(currentValue.mode === "gradient")
@@ -270,12 +269,6 @@ exports.Content = Montage.create(Component, {
 
             e.units ? newValue = e.value + e.units : newValue = e.value;
 
-            if(e.prop === "border-width") {// || e.prop === "border-style") {
-                ElementsMediator.setProperty(this.application.ninja.selectedElements, "border-style", [this.customSections[0].content.controls.borderStyle], "Change", "pi");
-            } else if(e.prop === "border-style") {
-                ElementsMediator.setProperty(this.application.ninja.selectedElements, "border-width", [this.customSections[0].content.controls.borderWidth + "px"], "Change", "pi");
-            }
-
             ElementsMediator.setProperty(this.application.ninja.selectedElements, e.prop, [newValue], "Change", "pi");
 
         }
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");
+                }
             }
         }
     }