diff options
author | Jose Antonio Marquez | 2012-06-26 11:33:29 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-26 11:33:29 -0700 |
commit | a1497ed180e668003c274dda90bfb9ab8bd1963e (patch) | |
tree | 10b3e2bcdc8b400ff6ac8c527b2b4ae829396b5d | |
parent | 879dc3285feef07bc532d3f51fdb8cdba8048313 (diff) | |
download | ninja-a1497ed180e668003c274dda90bfb9ab8bd1963e.tar.gz |
Hiding panel popup if opened when chip popup is opened
-rwxr-xr-x | js/panels/color/colorpopup-manager.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js index b0a523ab..aca2adc7 100755 --- a/js/panels/color/colorpopup-manager.js +++ b/js/panels/color/colorpopup-manager.js | |||
@@ -366,6 +366,8 @@ exports.ColorPopupManager = Montage.create(Component, { | |||
366 | this.showGradientChipPopup(e); | 366 | this.showGradientChipPopup(e); |
367 | return; | 367 | return; |
368 | } | 368 | } |
369 | //Hidding other popup if opened | ||
370 | if (this._popupBase && this._popupBase.opened) this.hideColorPopup(); | ||
369 | // | 371 | // |
370 | this._popupChipBtn = this.application.ninja.colorController.colorView.currentChip; | 372 | this._popupChipBtn = this.application.ninja.colorController.colorView.currentChip; |
371 | // | 373 | // |