From b435e97ff312eea15086069ce0ab6991acac32ff Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 25 Jun 2012 11:52:28 -0700
Subject: Color Popup Test Candidate

Preliminary check in for testing to commence on new color popup functionality.
---
 js/panels/color/colorpopup-manager.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'js/panels/color/colorpopup-manager.js')

diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 0ea02192..15d55787 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -216,6 +216,8 @@ exports.ColorPopupManager = Montage.create(Component, {
     //
     colorChipChange: {
     	value: function (e) {
+    		//
+    		if (!this._popupChipBtn) return;
     		//
     		var ctx,
     			cvs = this._popupChipBtn.getElementsByTagName('canvas')[0],
@@ -253,6 +255,8 @@ exports.ColorPopupManager = Montage.create(Component, {
     //
     colorGradientChipChange: {
     	value: function (e) {
+    		//
+    		if (!this._popupGradientChipBtn) return;
     		//
     		var ctx,
     			cvs = this._popupGradientChipBtn.getElementsByTagName('canvas')[0],
@@ -403,7 +407,7 @@ exports.ColorPopupManager = Montage.create(Component, {
     			if (e._event.srcElement.props) {
     				this._popupGradientChipBase.props = e._event.srcElement.props;
     			} else {
-    				this._popupGradientChipBase.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, history: false};
+    				this._popupGradientChipBase.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: false, history: false};
     			}
     			//
     			if (this._popupGradientChipBase.props.offset) {
-- 
cgit v1.2.3