aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/color')
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js8
1 files changed, 4 insertions, 4 deletions
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, {
1452 } else if (input === 'fill') { 1452 } else if (input === 'fill') {
1453 other = 'stroke'; 1453 other = 'stroke';
1454 } 1454 }
1455 if (this.colorManager.input === 'chip') {
1456 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
1457 return;
1458 }
1455 //TODO: Change popup to use montage's built in popup 1459 //TODO: Change popup to use montage's built in popup
1456 if (this.colorManager.input === input) { 1460 if (this.colorManager.input === input) {
1457 // 1461 //
@@ -1469,10 +1473,6 @@ exports.ColorPanelBase = Montage.create(Component, {
1469 } 1473 }
1470 } 1474 }
1471 } else { 1475 } else {
1472 if (this.colorManager.input === 'chip') {
1473 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
1474 return;
1475 }
1476 //TODO: Change popup to use montage's built in popup 1476 //TODO: Change popup to use montage's built in popup
1477 this.application.ninja.colorController.colorPopupManager.hideColorPopup(); 1477 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
1478 // 1478 //