diff options
author | Jose Antonio Marquez | 2012-06-15 15:14:34 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-15 15:14:34 -0700 |
commit | fbd9d2492aeaef392ad59792825b8757d6c363fc (patch) | |
tree | 0dd06cc81b258763f40628eabcb21fa186ab43b8 /js/models | |
parent | 43fdc63a00edede743212c0cefe2bd29a63de2ad (diff) | |
download | ninja-fbd9d2492aeaef392ad59792825b8757d6c363fc.tar.gz |
Fixing apply 'no color'
This should fix canvas and standard DOM elements including the root (body or template wrapper).
Diffstat (limited to 'js/models')
-rwxr-xr-x | js/models/color-model.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/models/color-model.js b/js/models/color-model.js index 764feeb5..a2eab2e1 100755 --- a/js/models/color-model.js +++ b/js/models/color-model.js | |||
@@ -231,10 +231,10 @@ exports.ColorModel = Montage.create(Component, { | |||
231 | // | 231 | // |
232 | applyNoColor: { | 232 | applyNoColor: { |
233 | enumerable: true, | 233 | enumerable: true, |
234 | value: function () { | 234 | value: function (code) { |
235 | // | 235 | // |
236 | var nocolor = {}; | 236 | var nocolor = {}; |
237 | nocolor.wasSetByCode = true; | 237 | nocolor.wasSetByCode = code; |
238 | nocolor.type = 'change'; | 238 | nocolor.type = 'change'; |
239 | this.updateColorSelected('nocolor', nocolor); | 239 | this.updateColorSelected('nocolor', nocolor); |
240 | } | 240 | } |
@@ -310,29 +310,29 @@ exports.ColorModel = Montage.create(Component, { | |||
310 | case 'hex': | 310 | case 'hex': |
311 | switch (color.length) { | 311 | switch (color.length) { |
312 | case 1: | 312 | case 1: |
313 | this.applyNoColor(); | 313 | this.applyNoColor(false); |
314 | return; | 314 | return; |
315 | break; | 315 | break; |
316 | case 2: | 316 | case 2: |
317 | this.applyNoColor(); | 317 | this.applyNoColor(false); |
318 | return; | 318 | return; |
319 | break; | 319 | break; |
320 | case 3: | 320 | case 3: |
321 | color = color[0]+color[0]+color[1]+color[1]+color[2]+color[2]; | 321 | color = color[0]+color[0]+color[1]+color[1]+color[2]+color[2]; |
322 | break; | 322 | break; |
323 | case 4: | 323 | case 4: |
324 | this.applyNoColor(); | 324 | this.applyNoColor(false); |
325 | return; | 325 | return; |
326 | break; | 326 | break; |
327 | case 5: | 327 | case 5: |
328 | this.applyNoColor(); | 328 | this.applyNoColor(false); |
329 | return; | 329 | return; |
330 | break; | 330 | break; |
331 | case 6: | 331 | case 6: |
332 | //Nothing | 332 | //Nothing |
333 | break; | 333 | break; |
334 | default: | 334 | default: |
335 | this.applyNoColor(); | 335 | this.applyNoColor(false); |
336 | return; | 336 | return; |
337 | break; | 337 | break; |
338 | } | 338 | } |