diff options
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-x | js/controllers/elements/element-controller.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index ac14def4..46e82ace 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -118,6 +118,7 @@ var ElementController = exports.ElementController = Montage.create(NJComponent, | |||
118 | } | 118 | } |
119 | else | 119 | else |
120 | { | 120 | { |
121 | // TODO - Need to update border style and width also | ||
121 | el.elementModel.stroke = colorObj; | 122 | el.elementModel.stroke = colorObj; |
122 | } | 123 | } |
123 | 124 | ||
@@ -162,10 +163,22 @@ var ElementController = exports.ElementController = Montage.create(NJComponent, | |||
162 | case 'gradient': | 163 | case 'gradient': |
163 | this.setProperty(el, "border-image", color.color.css); | 164 | this.setProperty(el, "border-image", color.color.css); |
164 | this.setProperty(el, "border-color", "none"); | 165 | this.setProperty(el, "border-color", "none"); |
166 | if(color.borderInfo) | ||
167 | { | ||
168 | this.setProperty(el, "border-width", color.borderInfo.borderWidth + | ||
169 | color.borderInfo.borderUnits); | ||
170 | this.setProperty(el, "border-style", color.borderInfo.borderStyle); | ||
171 | } | ||
165 | break; | 172 | break; |
166 | default: | 173 | default: |
167 | this.setProperty(el, "border-image", "none"); | 174 | this.setProperty(el, "border-image", "none"); |
168 | this.setProperty(el, "border-color", color.color.css); | 175 | this.setProperty(el, "border-color", color.color.css); |
176 | if(color.borderInfo) | ||
177 | { | ||
178 | this.setProperty(el, "border-width", color.borderInfo.borderWidth + | ||
179 | color.borderInfo.borderUnits); | ||
180 | this.setProperty(el, "border-style", color.borderInfo.borderStyle); | ||
181 | } | ||
169 | } | 182 | } |
170 | } | 183 | } |
171 | el.elementModel.stroke = color; | 184 | el.elementModel.stroke = color; |