From f704705fd85c1af44ad86f8c29e8e93d330796e5 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 27 Jun 2012 15:31:53 -0700
Subject: Adding a dismiss step when switching popups

This is needed to allow for model to change during draw routines
---
 js/panels/color/colorpanelbase.reel/colorpanelbase.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/panels/color/colorpanelbase.reel')

diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index db46ced7..40c384fb 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
@@ -1469,6 +1469,10 @@ 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