From 60356eeb3f38acadb87d4a3a9301a194941221d9 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Mon, 25 Jun 2012 21:26:49 -0700 Subject: Partially fixing alpha issues on gradient stops Still need to implement getting value on retrieve while opening --- js/panels/color/colorpopup-manager.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'js/panels') 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, { 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}; this.colorGradientChipChange(e); } else if (!this._popupBase || (this._popupBase && !this._popupBase.opened)){ - // - this._popupChipBtn.color('gradient', e._event.gradient); - } + if (e._event.gradient && !e._event.wasSetByCode) { + this._popupChipBtn.color('gradient', e._event.gradient); + } else if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) { + this.colorGradientChipChange(e); + } + } else { + if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) { + this.colorGradientChipChange(e); + } + } return; } // -- cgit v1.2.3