Fixing gradient/solid color toggle

Also added a null value setter fix for no color hex

1 files changed, 2 insertions, 0 deletions

diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index caccf977..5be652c9 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -605,6 +605,7 @@ exports.ColorPopupManager = Montage.create(Component, {
                                 if (e._event.gradient && !e._event.wasSetByCode) {
                                         //
                                         this._popupChipBtn.color('gradient', e._event.gradient);
+                                        this._popupChipBase._components.hex.value = null;
                                 } else if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) {
                                         this.colorChipChange(e);
                                 }
@@ -617,6 +618,7 @@ exports.ColorPopupManager = Montage.create(Component, {
                         } else if (!this._popupBase || (this._popupBase && !this._popupBase.opened)){
                                 if (e._event.gradient && !e._event.wasSetByCode) {
                                         this._popupChipBtn.color('gradient', e._event.gradient);
+                                        this._popupChipBase._components.hex.value = null;
                                 } else if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) {
                                         this.colorGradientChipChange(e);
                                 }