diff options
author | Jose Antonio Marquez | 2012-06-26 13:39:56 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-26 13:39:56 -0700 |
commit | 9ebf80d943b894242d90cf62bc3078c6a83041ad (patch) | |
tree | 849990db2c27cf8f127f9452c9b3e782ad73b34b /js/panels/color/colorpanelbase.reel/colorpanelbase.js | |
parent | 2a74d2c18960cb52db125f21e880cc4876a1c3fb (diff) | |
download | ninja-9ebf80d943b894242d90cf62bc3078c6a83041ad.tar.gz |
Fixing gradient/solid color toggle
Also added a null value setter fix for no color hex
Diffstat (limited to 'js/panels/color/colorpanelbase.reel/colorpanelbase.js')
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/colorpanelbase.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js index b3045db1..db46ced7 100755 --- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js +++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js | |||
@@ -482,12 +482,14 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
482 | this.ctx.clearRect(0, 0, this.cvs.width, this.cvs.height); | 482 | this.ctx.clearRect(0, 0, this.cvs.width, this.cvs.height); |
483 | if (m === 'gradient') { | 483 | if (m === 'gradient') { |
484 | this.style.backgroundImage = c.css; | 484 | this.style.backgroundImage = c.css; |
485 | this.style.backgroundColor = 'transparent'; | ||
485 | } else { | 486 | } else { |
486 | this.style.backgroundColor = c.css; | 487 | this.style.backgroundColor = c.css; |
488 | this.style.backgroundImage = 'none'; | ||
487 | } | 489 | } |
488 | } else { | 490 | } else { |
489 | this.drawNoColor(this, this.cvs); | 491 | this.drawNoColor(this, this.cvs); |
490 | }9 | 492 | } |
491 | this.colorValue = c; | 493 | this.colorValue = c; |
492 | this.colorMode = m; | 494 | this.colorMode = m; |
493 | this.otherInput = false; | 495 | this.otherInput = false; |