From 9ebf80d943b894242d90cf62bc3078c6a83041ad Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 26 Jun 2012 13:39:56 -0700 Subject: Fixing gradient/solid color toggle Also added a null value setter fix for no color hex --- js/panels/color/colorpanelbase.reel/colorpanelbase.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'js/panels/color/colorpanelbase.reel/colorpanelbase.js') 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, { this.ctx.clearRect(0, 0, this.cvs.width, this.cvs.height); if (m === 'gradient') { this.style.backgroundImage = c.css; + this.style.backgroundColor = 'transparent'; } else { this.style.backgroundColor = c.css; + this.style.backgroundImage = 'none'; } } else { this.drawNoColor(this, this.cvs); - }9 + } this.colorValue = c; this.colorMode = m; this.otherInput = false; -- cgit v1.2.3