From 5233508614656c529d6c596f7e2f2c24adce9b69 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 30 Jan 2012 15:18:50 -0800
Subject: IKNINJA-1083

Fixing minor bug with no color breaking on null alpha value.
---
 js/panels/Color/colorchippopup.reel/colorchippopup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.js b/js/panels/Color/colorchippopup.reel/colorchippopup.js
index 03e14b28..05bcb447 100644
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/Color/colorchippopup.reel/colorchippopup.js
@@ -109,7 +109,7 @@ exports.ColorChipPopup = Montage.create(Component, {
    			this.cc_hexinput.labelFunction = this._hexLabel.bind(this);
     		this.cc_hexinput.inputFunction = this._hexInput.bind(this);
    			//
-   			if (this.application.ninja.colorController.colorView.currentChip && this.application.ninja.colorController.colorView.currentChip.colorValue.a) {
+   			if (this.application.ninja.colorController.colorView.currentChip && this.application.ninja.colorController.colorView.currentChip.colorValue && this.application.ninja.colorController.colorView.currentChip.colorValue.a) {
    				this.combo.slider.value = Math.round(this.application.ninja.colorController.colorView.currentChip.colorValue.a*100);
    			} else {
    				this.combo.slider.value = 100;
-- 
cgit v1.2.3