aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js2
-rwxr-xr-xjs/panels/color/colorpopup-manager.js6
2 files changed, 6 insertions, 2 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
index 4865d3dd..f2e5bb2e 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
@@ -295,6 +295,8 @@ exports.ColorPanelPopup = Montage.create(Component, {
295 } 295 }
296 // 296 //
297 if (!this.isPopupChip) this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); 297 if (!this.isPopupChip) this.application.ninja.colorController.colorPopupManager.hideColorChipPopup();
298 //
299 this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
298 } 300 }
299 }, 301 },
300 //////////////////////////////////////////////////////////////////// 302 ////////////////////////////////////////////////////////////////////
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 5be652c9..f4bb9203 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -502,10 +502,12 @@ exports.ColorPopupManager = Montage.create(Component, {
502 if (this._popupGradientChipBase && this._popupGradientChipBase.opened) { 502 if (this._popupGradientChipBase && this._popupGradientChipBase.opened) {
503 // 503 //
504 this._popupGradientChipBase.popup.removeEventListener('didDraw', this, false); 504 this._popupGradientChipBase.popup.removeEventListener('didDraw', this, false);
505 //Making sure to return color manager to either stroke or fill (might be a Hack for now) 505 //TODO: Add correct input setback
506 if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput) { 506 /*
507if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput) {
507 this.colorManager.input = this.application.ninja.colorController.colorView.previousInput; 508 this.colorManager.input = this.application.ninja.colorController.colorView.previousInput;
508 } 509 }
510*/
509 // 511 //
510 this.application.ninja.popupManager.removePopup(this._popupGradientChipBase.popup.element); 512 this.application.ninja.popupManager.removePopup(this._popupGradientChipBase.popup.element);
511 this._popupGradientChipBase.opened = false; 513 this._popupGradientChipBase.opened = false;