diff options
Diffstat (limited to 'js/panels/color/colorpopup-manager.js')
-rwxr-xr-x | js/panels/color/colorpopup-manager.js | 6 |
1 files changed, 4 insertions, 2 deletions
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 | /* |
507 | if (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; |