From a177f4d3a534795f4229128be4316e37d51555d9 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sat, 23 Jun 2012 00:14:03 -0700
Subject: Fixing logic for popup value bubbling

Only working for HSV, need to implement HEX and gradient
---
 js/panels/color/colorpopup-manager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/panels/color')

diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 717e6fa2..29f9ec94 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -8,7 +8,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //
 var Montage =			require("montage/core/core").Montage,
 	Component =			require("montage/ui/component").Component,
-	ColorChipPopup =	require("js/panels/Color/colorchippopup.reel").ColorChipPopup,
 	ColorPanelPopup =	require("js/panels/Color/colorpanelpopup.reel").ColorPanelPopup,
 	ColorModel =        require("js/models/color-model").ColorModel;
 ////////////////////////////////////////////////////////////////////////
@@ -294,6 +293,7 @@ exports.ColorPopupManager = Montage.create(Component, {
 	    			this.showGradientChipPopup(e);
 	    			return;
     			}
+    			//
     			this._colorChipPopupDrawing = true;
     			////////////////////////////////////////////////////
     			//Initializing events
@@ -586,7 +586,7 @@ exports.ColorPopupManager = Montage.create(Component, {
     //
     handleChange: {
     	value: function (e) {
-    		if (this._popupChipBase && this._popupChipBase.opened && !this._popupGradientChipBase) {
+    		if (this._popupChipBase && this._popupChipBase.opened && (!this._popupGradientChipBase || (this._popupGradientChipBase && !this._popupGradientChipBase.opened))) {
     			if (e._event.hsv) {
     				this._popupChipBase.colorManager.hsv = {h: e._event.hsv.h, s: e._event.hsv.s, v: e._event.hsv.v, type: e._event.type, wasSetByCode: e._event.wasSetByCode};
     				this.colorChipChange(e);
-- 
cgit v1.2.3