From 6a437087e6956904c3b4ff6a09f3cb61d2feb94d Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 25 Jun 2012 16:52:25 -0700
Subject: Adding default values to chip

This is a fallback is null and alpha is changed.
---
 js/panels/color/colorpopup-manager.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 01727446..a8e3ba6c 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -283,7 +283,11 @@ exports.ColorPopupManager = Montage.create(Component, {
 				ctx.stroke();
 			}
     		//
-    		this._popupChipBtn.color('rgb', {r: rgb.r, g: rgb.g, b: rgb.b, a: alpha, css: 'rgba('+rgb.r+', '+rgb.g+', '+rgb.b+', '+alpha+')'});
+    		if (rgb) {
+    			this._popupChipBtn.color('rgb', {r: rgb.r, g: rgb.g, b: rgb.b, a: alpha, css: 'rgba('+rgb.r+', '+rgb.g+', '+rgb.b+', '+alpha+')'});
+    		} else {
+	    		this._popupChipBtn.color('rgb', {r: 255, g: 255, b: 255, a: alpha, css: 'rgba(255, 255, 255, '+alpha+')'});
+    		}
     	}
     },
     ////////////////////////////////////////////////////////////////////
@@ -322,7 +326,11 @@ exports.ColorPopupManager = Montage.create(Component, {
 				ctx.stroke();
 			}
     		//
-    		this._popupGradientChipBtn.color('rgb', {r: rgb.r, g: rgb.g, b: rgb.b, a: alpha, css: 'rgba('+rgb.r+', '+rgb.g+', '+rgb.b+', '+alpha+')'});
+    		if (rgb) {
+    			this._popupGradientChipBtn.color('rgb', {r: rgb.r, g: rgb.g, b: rgb.b, a: alpha, css: 'rgba('+rgb.r+', '+rgb.g+', '+rgb.b+', '+alpha+')'});
+    		} else {
+	    		this._popupGradientChipBtn.color('rgb', {r: 255, g: 255, b: 255, a: alpha, css: 'rgba(255, 255, 255, '+alpha+')'});
+    		}
     	}
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3