diff options
Diffstat (limited to 'js/controllers/color-controller.js')
-rwxr-xr-x | js/controllers/color-controller.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index 53573baf..8e000b19 100755 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js | |||
@@ -198,7 +198,6 @@ exports.ColorController = Montage.create(Component, { | |||
198 | handleChange: { | 198 | handleChange: { |
199 | enumerable: true, | 199 | enumerable: true, |
200 | value: function (e) { | 200 | value: function (e) { |
201 | |||
202 | // | 201 | // |
203 | var actionEvent, color, input = e._event.input, panelMode, mode = e._event.mode; | 202 | var actionEvent, color, input = e._event.input, panelMode, mode = e._event.mode; |
204 | if (this.colorView) { | 203 | if (this.colorView) { |
@@ -228,14 +227,14 @@ exports.ColorController = Montage.create(Component, { | |||
228 | // | 227 | // |
229 | this.fill = color; | 228 | this.fill = color; |
230 | // | 229 | // |
231 | if(e._event.wasSetByCode) return; | 230 | if(e._event.wasSetByCode && mode !== 'nocolor') return; |
232 | // | 231 | // |
233 | this.setColor(mode, color, true); | 232 | this.setColor(mode, color, true); |
234 | } else if (input === 'stroke') { | 233 | } else if (input === 'stroke') { |
235 | // | 234 | // |
236 | this.stroke = color; | 235 | this.stroke = color; |
237 | // | 236 | // |
238 | if(e._event.wasSetByCode) return; | 237 | if(e._event.wasSetByCode && mode !== 'nocolor') return; |
239 | 238 | ||
240 | this.setColor(mode, color, false); | 239 | this.setColor(mode, color, false); |
241 | } | 240 | } |