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/panels/color/colorpanelpopup.reel | |
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/panels/color/colorpanelpopup.reel')
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js index 4161cb50..ded06797 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | |||
@@ -50,8 +50,8 @@ exports.ColorPanelPopup = Montage.create(Component, { | |||
50 | //////////////////////////////////////////////////////////////////// | 50 | //////////////////////////////////////////////////////////////////// |
51 | // | 51 | // |
52 | setNoColor: { | 52 | setNoColor: { |
53 | value: function (e) { | 53 | value: function (code) { |
54 | if (this.colorManager) this.colorManager.applyNoColor(); | 54 | if (this.colorManager) this.colorManager.applyNoColor(code); |
55 | } | 55 | } |
56 | }, | 56 | }, |
57 | //////////////////////////////////////////////////////////////////// | 57 | //////////////////////////////////////////////////////////////////// |
@@ -308,7 +308,7 @@ exports.ColorPanelPopup = Montage.create(Component, { | |||
308 | color.type = 'change'; | 308 | color.type = 'change'; |
309 | this.colorManager.hsl = color; | 309 | this.colorManager.hsl = color; |
310 | } else { | 310 | } else { |
311 | this.colorManager.applyNoColor(); | 311 | this.colorManager.applyNoColor(false); |
312 | } | 312 | } |
313 | } else { | 313 | } else { |
314 | color = this.colorManager.hexToRgb(b._event.srcElement.colorValue); | 314 | color = this.colorManager.hexToRgb(b._event.srcElement.colorValue); |
@@ -317,7 +317,7 @@ exports.ColorPanelPopup = Montage.create(Component, { | |||
317 | color.type = 'change'; | 317 | color.type = 'change'; |
318 | this.colorManager.rgb = color; | 318 | this.colorManager.rgb = color; |
319 | } else { | 319 | } else { |
320 | this.colorManager.applyNoColor(); | 320 | this.colorManager.applyNoColor(false); |
321 | } | 321 | } |
322 | } | 322 | } |
323 | } | 323 | } |