diff options
Diffstat (limited to 'js/panels/color/colorpopup-manager.js')
| -rwxr-xr-x | js/panels/color/colorpopup-manager.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js index fd5a3239..5676095d 100755 --- a/js/panels/color/colorpopup-manager.js +++ b/js/panels/color/colorpopup-manager.js | |||
| @@ -607,9 +607,16 @@ exports.ColorPopupManager = Montage.create(Component, { | |||
| 607 | this._popupGradientChipBase.colorManager.hsv = {h: e._event.hsv.h, s: e._event.hsv.s, v: e._event.hsv.v, type: e._event.type, wasSetByCode: e._event.wasSetByCode}; | 607 | this._popupGradientChipBase.colorManager.hsv = {h: e._event.hsv.h, s: e._event.hsv.s, v: e._event.hsv.v, type: e._event.type, wasSetByCode: e._event.wasSetByCode}; |
| 608 | this.colorGradientChipChange(e); | 608 | this.colorGradientChipChange(e); |
| 609 | } else if (!this._popupBase || (this._popupBase && !this._popupBase.opened)){ | 609 | } else if (!this._popupBase || (this._popupBase && !this._popupBase.opened)){ |
| 610 | // | 610 | if (e._event.gradient && !e._event.wasSetByCode) { |
| 611 | this._popupChipBtn.color('gradient', e._event.gradient); | 611 | this._popupChipBtn.color('gradient', e._event.gradient); |
| 612 | } | 612 | } else if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) { |
| 613 | this.colorGradientChipChange(e); | ||
| 614 | } | ||
| 615 | } else { | ||
| 616 | if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) { | ||
| 617 | this.colorGradientChipChange(e); | ||
| 618 | } | ||
| 619 | } | ||
| 613 | return; | 620 | return; |
| 614 | } | 621 | } |
| 615 | // | 622 | // |