From 9d7aaf42b4f0bcd3d6aa494bddd64519f1020abd Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 27 Jun 2012 11:30:23 -0700
Subject: Fixing palette reference bug

---
 js/panels/color/colorpopup-manager.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(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 91f776bd..d5cc8ac8 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -621,6 +621,8 @@ exports.ColorPopupManager = Montage.create(Component, {
 	    				this.colorChipChange(e);
 	    			} else if (!e._event.wasSetByCode && (e._event.mode && e._event.mode === 'nocolor')) {
 		    			this.colorChipChange(e);
+	    			} else if (!e._event.wasSetByCode && (e._event.mode && e._event.mode === 'hex')) {
+		    			this.colorChipChange(e);
 	    			}
     			}
     			return;
@@ -637,14 +639,18 @@ exports.ColorPopupManager = Montage.create(Component, {
 		    				this._popupGradientChipBase.colorManager.alpha = {value: e._target._numValue/100, type: 'change', wasSetByCode: false};	
 	    				}
     					this.colorGradientChipChange(e);
-    				}
+    				} else if (!e._event.wasSetByCode && (e._event.mode && e._event.mode === 'hex')) {
+		    			this.colorGradientChipChange(e);
+	    			}
     			} else {
     				if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) {
     					if (!isNaN(e._target._numValue)) {
 		    				this._popupGradientChipBase.colorManager.alpha = {value: e._target._numValue/100, type: 'change', wasSetByCode: false};	
 	    				}
     					this.colorGradientChipChange(e);
-    				}
+    				} else if (!e._event.wasSetByCode && (e._event.mode && e._event.mode === 'hex')) {
+		    			this.colorGradientChipChange(e);
+	    			}
 			    }
     			return;
     		}
-- 
cgit v1.2.3