From 2c6339a9191033c937c2bac3e181c2bc380f4c48 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Mon, 12 Mar 2012 12:00:07 -0700 Subject: Fixed element mediator, PI, and eye-dropper to handle different borders sides and gradients. Signed-off-by: Nivesh Rajbhandari --- 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