From 4f0104b0120219cbba2e0ac02c7b6aea437dd212 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 27 Jun 2012 16:26:16 -0700
Subject: Fixing minor color history bug

---
 js/panels/color/colorpanelbase.reel/colorpanelbase.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js/panels/color')

diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index 40c384fb..7208c2da 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
@@ -1452,6 +1452,10 @@ exports.ColorPanelBase = Montage.create(Component, {
             } else if (input === 'fill') {
                 other = 'stroke';
             }
+            if (this.colorManager.input === 'chip') {
+            	this.application.ninja.colorController.colorPopupManager.hideColorPopup();
+           		return;
+           	}
             //TODO: Change popup to use montage's built in popup
             if (this.colorManager.input === input) {
                 //
@@ -1469,10 +1473,6 @@ exports.ColorPanelBase = Montage.create(Component, {
                     }
                 }
             } else {
-            	if (this.colorManager.input === 'chip') {
-            		this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            		return;
-            	}
                 //TODO: Change popup to use montage's built in popup
                 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
                 //
-- 
cgit v1.2.3