aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color/colorpanelbase.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-27 15:31:53 -0700
committerJose Antonio Marquez2012-06-27 15:31:53 -0700
commitf704705fd85c1af44ad86f8c29e8e93d330796e5 (patch)
tree612bd0744b9b0cd7ae8f55ff73a66b4c14d24cb2 /js/panels/color/colorpanelbase.reel
parent9d7aaf42b4f0bcd3d6aa494bddd64519f1020abd (diff)
downloadninja-f704705fd85c1af44ad86f8c29e8e93d330796e5.tar.gz
Adding a dismiss step when switching popups
This is needed to allow for model to change during draw routines
Diffstat (limited to 'js/panels/color/colorpanelbase.reel')
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js4
1 files changed, 4 insertions, 0 deletions
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, {
1469 } 1469 }
1470 } 1470 }
1471 } else { 1471 } else {
1472 if (this.colorManager.input === 'chip') {
1473 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
1474 return;
1475 }
1472 //TODO: Change popup to use montage's built in popup 1476 //TODO: Change popup to use montage's built in popup
1473 this.application.ninja.colorController.colorPopupManager.hideColorPopup(); 1477 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
1474 // 1478 //