diff options
author | Jose Antonio Marquez | 2012-06-25 21:26:49 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-25 21:26:49 -0700 |
commit | 60356eeb3f38acadb87d4a3a9301a194941221d9 (patch) | |
tree | 5a7196136630331643e127977abfefcfc5b0e0c6 /js | |
parent | 6ecc23f6c56a7e37f466d5ea59d995f75ada941a (diff) | |
download | ninja-60356eeb3f38acadb87d4a3a9301a194941221d9.tar.gz |
Partially fixing alpha issues on gradient stops
Still need to implement getting value on retrieve while opening
Diffstat (limited to '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 | // |