From aa1ca17eb5d46d8e5bcbf2de70f312cfbb779545 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 26 Jun 2012 14:38:19 -0700 Subject: Fixing losing focus when switch wheels from popups (nested) --- js/panels/color/colorpopup-manager.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'js') diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js index f4bb9203..0f8e20e6 100755 --- a/js/panels/color/colorpopup-manager.js +++ b/js/panels/color/colorpopup-manager.js @@ -503,11 +503,9 @@ exports.ColorPopupManager = Montage.create(Component, { // this._popupGradientChipBase.popup.removeEventListener('didDraw', this, false); //TODO: Add correct input setback - /* -if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput) { + if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput && (!this._popupChipBase || (this._popupChipBase && !this._popupChipBase.opened))) { this.colorManager.input = this.application.ninja.colorController.colorView.previousInput; } -*/ // this.application.ninja.popupManager.removePopup(this._popupGradientChipBase.popup.element); this._popupGradientChipBase.opened = false; -- cgit v1.2.3