aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/element-controller.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-xjs/controllers/elements/element-controller.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index d6f2bc56..ec0335b4 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -122,6 +122,7 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
122 } 122 }
123 else 123 else
124 { 124 {
125 // TODO - Need to update border style and width also
125 el.elementModel.stroke = colorObj; 126 el.elementModel.stroke = colorObj;
126 } 127 }
127 128
@@ -166,10 +167,22 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
166 case 'gradient': 167 case 'gradient':
167 this.setProperty(el, "border-image", color.color.css); 168 this.setProperty(el, "border-image", color.color.css);
168 this.setProperty(el, "border-color", "none"); 169 this.setProperty(el, "border-color", "none");
170 if(color.borderInfo)
171 {
172 this.setProperty(el, "border-width", color.borderInfo.borderWidth +
173 color.borderInfo.borderUnits);
174 this.setProperty(el, "border-style", color.borderInfo.borderStyle);
175 }
169 break; 176 break;
170 default: 177 default:
171 this.setProperty(el, "border-image", "none"); 178 this.setProperty(el, "border-image", "none");
172 this.setProperty(el, "border-color", color.color.css); 179 this.setProperty(el, "border-color", color.color.css);
180 if(color.borderInfo)
181 {
182 this.setProperty(el, "border-width", color.borderInfo.borderWidth +
183 color.borderInfo.borderUnits);
184 this.setProperty(el, "border-style", color.borderInfo.borderStyle);
185 }
173 } 186 }
174 } 187 }
175 el.elementModel.stroke = color; 188 el.elementModel.stroke = color;