diff options
Diffstat (limited to 'js/panels/color/colorpopup-manager.js')
-rwxr-xr-x | js/panels/color/colorpopup-manager.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js index 91f776bd..d5cc8ac8 100755 --- a/js/panels/color/colorpopup-manager.js +++ b/js/panels/color/colorpopup-manager.js | |||
@@ -621,6 +621,8 @@ exports.ColorPopupManager = Montage.create(Component, { | |||
621 | this.colorChipChange(e); | 621 | this.colorChipChange(e); |
622 | } else if (!e._event.wasSetByCode && (e._event.mode && e._event.mode === 'nocolor')) { | 622 | } else if (!e._event.wasSetByCode && (e._event.mode && e._event.mode === 'nocolor')) { |
623 | this.colorChipChange(e); | 623 | this.colorChipChange(e); |
624 | } else if (!e._event.wasSetByCode && (e._event.mode && e._event.mode === 'hex')) { | ||
625 | this.colorChipChange(e); | ||
624 | } | 626 | } |
625 | } | 627 | } |
626 | return; | 628 | return; |
@@ -637,14 +639,18 @@ exports.ColorPopupManager = Montage.create(Component, { | |||
637 | this._popupGradientChipBase.colorManager.alpha = {value: e._target._numValue/100, type: 'change', wasSetByCode: false}; | 639 | this._popupGradientChipBase.colorManager.alpha = {value: e._target._numValue/100, type: 'change', wasSetByCode: false}; |
638 | } | 640 | } |
639 | this.colorGradientChipChange(e); | 641 | this.colorGradientChipChange(e); |
640 | } | 642 | } else if (!e._event.wasSetByCode && (e._event.mode && e._event.mode === 'hex')) { |
643 | this.colorGradientChipChange(e); | ||
644 | } | ||
641 | } else { | 645 | } else { |
642 | if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) { | 646 | if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) { |
643 | if (!isNaN(e._target._numValue)) { | 647 | if (!isNaN(e._target._numValue)) { |
644 | this._popupGradientChipBase.colorManager.alpha = {value: e._target._numValue/100, type: 'change', wasSetByCode: false}; | 648 | this._popupGradientChipBase.colorManager.alpha = {value: e._target._numValue/100, type: 'change', wasSetByCode: false}; |
645 | } | 649 | } |
646 | this.colorGradientChipChange(e); | 650 | this.colorGradientChipChange(e); |
647 | } | 651 | } else if (!e._event.wasSetByCode && (e._event.mode && e._event.mode === 'hex')) { |
652 | this.colorGradientChipChange(e); | ||
653 | } | ||
648 | } | 654 | } |
649 | return; | 655 | return; |
650 | } | 656 | } |