aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-26 14:38:19 -0700
committerJose Antonio Marquez2012-06-26 14:38:19 -0700
commitaa1ca17eb5d46d8e5bcbf2de70f312cfbb779545 (patch)
tree47fb1391a95331b20cfb3f515d20620405dcc156 /js/panels/color
parentdeadc9369dec77b425d4ff895a1abdd9fb5ed1ac (diff)
downloadninja-aa1ca17eb5d46d8e5bcbf2de70f312cfbb779545.tar.gz
Fixing losing focus when switch wheels from popups (nested)
Diffstat (limited to 'js/panels/color')
-rwxr-xr-xjs/panels/color/colorpopup-manager.js4
1 files changed, 1 insertions, 3 deletions
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, {
503 // 503 //
504 this._popupGradientChipBase.popup.removeEventListener('didDraw', this, false); 504 this._popupGradientChipBase.popup.removeEventListener('didDraw', this, false);
505 //TODO: Add correct input setback 505 //TODO: Add correct input setback
506 /* 506 if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput && (!this._popupChipBase || (this._popupChipBase && !this._popupChipBase.opened))) {
507if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput) {
508 this.colorManager.input = this.application.ninja.colorController.colorView.previousInput; 507 this.colorManager.input = this.application.ninja.colorController.colorView.previousInput;
509 } 508 }
510*/
511 // 509 //
512 this.application.ninja.popupManager.removePopup(this._popupGradientChipBase.popup.element); 510 this.application.ninja.popupManager.removePopup(this._popupGradientChipBase.popup.element);
513 this._popupGradientChipBase.opened = false; 511 this._popupGradientChipBase.opened = false;