From 82b0c1b8ee197e23fbd5184cbb0522ca76e651c8 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Thu, 31 May 2012 14:27:51 -0700 Subject: Color Chip Signed-off-by: Kruti Shah --- js/controllers/elements/element-controller.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'js/controllers/elements/element-controller.js') diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 675176e9..db1d5e49 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js @@ -148,7 +148,7 @@ exports.ElementController = Montage.create(Component, { }, setColor: { - value: function(el, color, isFill) { + value: function(el, color, isFill,borderSide) { var mode = color.mode; if(isFill) { @@ -191,8 +191,12 @@ exports.ElementController = Montage.create(Component, { } break; default: - this.setProperty(el, "border-image", "none"); - this.setProperty(el, "border-color", color.color.css); + if(borderSide){ + this.setProperty(el,"border-"+borderSide+"-color",color.color.css); + }else{ + this.setProperty(el, "border-image", "none"); + this.setProperty(el, "border-color", color.color.css); + } if(color.borderInfo) { if(color.borderInfo.borderWidth) { this.setProperty(el, "border-width", color.borderInfo.borderWidth + color.borderInfo.borderUnits); -- cgit v1.2.3