aboutsummaryrefslogtreecommitdiff
path: root/js/models/color-model.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-18 22:22:57 -0700
committerValerio Virgillito2012-06-18 22:22:57 -0700
commit795a6908ccac21b773490954371f2c4def9e5379 (patch)
tree68db12b1fc96286cc8ff78034c7b155df71f9ef3 /js/models/color-model.js
parentad6f78493295c9c7b4c11cd6a895dd5cc8e207f7 (diff)
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
downloadninja-795a6908ccac21b773490954371f2c4def9e5379.tar.gz
Merge branch 'refs/heads/master' into montage-v11-integration
Diffstat (limited to 'js/models/color-model.js')
-rwxr-xr-xjs/models/color-model.js14
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 }