From e065244ac75d1d0f25fd5c75cb58e714a13fe16b Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 14 Mar 2012 08:59:17 -0700 Subject: Squashed commit of the following: merge master into timeline Signed-off-by: Jonathan Duran --- js/mediators/element-mediator.js | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'js/mediators/element-mediator.js') 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: { -- cgit v1.2.3