Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 2 insertions, 13 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 127f73e1..d62fa1f8 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -459,13 +459,12 @@ exports.ElementMediator = Montage.create(NJComponent, {
 
     //--------------------------------------------------------------------------------------------------------
     // Routines to get/set color
-    // for now just return the bg/fill color
     getColor: {
-        value: function(el, isFill) {
+        value: function(el, isFill, borderSide) {
             if(!el.elementModel) {
                 NJUtils.makeModelFromElement(el);
             }
-            return el.elementModel.controller["getColor"](el, isFill);
+            return el.elementModel.controller["getColor"](el, isFill, borderSide);
         }
     },
 
@@ -621,16 +620,6 @@ exports.ElementMediator = Montage.create(NJComponent, {
         }
     },
 
-    getColor2: {
-        value: function(el, prop, mutator) {
-            if(!el.elementModel) {
-                NJUtils.makeModelFromElement(el);
-            }
-
-            return this.getColor(el, (prop === "background"));
-        }
-    },
-
     //--------------------------------------------------------------------------------------------------------
     // Routines to get/set 3D properties
     get3DProperty: {