diff options
author | Kruti Shah | 2012-05-31 14:27:51 -0700 |
---|---|---|
committer | Kruti Shah | 2012-05-31 14:27:51 -0700 |
commit | 82b0c1b8ee197e23fbd5184cbb0522ca76e651c8 (patch) | |
tree | 1efad1d6b5c7e82ca1adcf2f18e8aa12931206ec /js/controllers | |
parent | c350cc1c060fdf17357ddadce024267943784593 (diff) | |
download | ninja-82b0c1b8ee197e23fbd5184cbb0522ca76e651c8.tar.gz |
Color Chip
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/elements/element-controller.js | 10 |
1 files changed, 7 insertions, 3 deletions
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, { | |||
148 | }, | 148 | }, |
149 | 149 | ||
150 | setColor: { | 150 | setColor: { |
151 | value: function(el, color, isFill) { | 151 | value: function(el, color, isFill,borderSide) { |
152 | var mode = color.mode; | 152 | var mode = color.mode; |
153 | 153 | ||
154 | if(isFill) { | 154 | if(isFill) { |
@@ -191,8 +191,12 @@ exports.ElementController = Montage.create(Component, { | |||
191 | } | 191 | } |
192 | break; | 192 | break; |
193 | default: | 193 | default: |
194 | this.setProperty(el, "border-image", "none"); | 194 | if(borderSide){ |
195 | this.setProperty(el, "border-color", color.color.css); | 195 | this.setProperty(el,"border-"+borderSide+"-color",color.color.css); |
196 | }else{ | ||
197 | this.setProperty(el, "border-image", "none"); | ||
198 | this.setProperty(el, "border-color", color.color.css); | ||
199 | } | ||
196 | if(color.borderInfo) { | 200 | if(color.borderInfo) { |
197 | if(color.borderInfo.borderWidth) { | 201 | if(color.borderInfo.borderWidth) { |
198 | this.setProperty(el, "border-width", color.borderInfo.borderWidth + color.borderInfo.borderUnits); | 202 | this.setProperty(el, "border-width", color.borderInfo.borderWidth + color.borderInfo.borderUnits); |