diff options
author | Jose Antonio Marquez | 2012-06-25 16:44:43 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-25 16:44:43 -0700 |
commit | b5a3d34eadedbbbdd77636a32dbe56902b57c4e3 (patch) | |
tree | e111aa186a6cfff3b6f51f88c639dbd86a5be09e | |
parent | 1e0864f414bcc97efdee28be4a71a0920cfed450 (diff) | |
download | ninja-b5a3d34eadedbbbdd77636a32dbe56902b57c4e3.tar.gz |
Fixing alpha slider for chip popups
-rwxr-xr-x | js/panels/color/colorpopup-manager.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js index f04da850..01727446 100755 --- a/js/panels/color/colorpopup-manager.js +++ b/js/panels/color/colorpopup-manager.js | |||
@@ -544,6 +544,12 @@ exports.ColorPopupManager = Montage.create(Component, { | |||
544 | hsv = this.colorManager.rgbToHsv(color.r, color.g, color.b); | 544 | hsv = this.colorManager.rgbToHsv(color.r, color.g, color.b); |
545 | } | 545 | } |
546 | // | 546 | // |
547 | if (color && color.a && !e._target.base.props.panel) { | ||
548 | e._target.base._components.combo.slider.value = color.a*100; | ||
549 | } else if (!e._target.base.props.panel){ | ||
550 | e._target.base._components.combo.slider.value = 100; | ||
551 | } | ||
552 | // | ||
547 | if (hsv) { | 553 | if (hsv) { |
548 | hsv.wasSetByCode = false; | 554 | hsv.wasSetByCode = false; |
549 | hsv.type = 'change'; | 555 | hsv.type = 'change'; |
@@ -567,6 +573,8 @@ exports.ColorPopupManager = Montage.create(Component, { | |||
567 | if (e._event.gradient && !e._event.wasSetByCode) { | 573 | if (e._event.gradient && !e._event.wasSetByCode) { |
568 | // | 574 | // |
569 | this._popupChipBtn.color('gradient', e._event.gradient); | 575 | this._popupChipBtn.color('gradient', e._event.gradient); |
576 | } else if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) { | ||
577 | this.colorChipChange(e); | ||
570 | } | 578 | } |
571 | } | 579 | } |
572 | return; | 580 | return; |
@@ -600,6 +608,7 @@ exports.ColorPopupManager = Montage.create(Component, { | |||
600 | // | 608 | // |
601 | handleChanging: { | 609 | handleChanging: { |
602 | value: function (e) { | 610 | value: function (e) { |
611 | if (!this._popupBase || !this._popupBase.opened) return; | ||
603 | if (e._event.hsv) { | 612 | if (e._event.hsv) { |
604 | // | 613 | // |
605 | if(e._target._colorBarCanvas && this.colorManager.input !== 'chip') { | 614 | if(e._target._colorBarCanvas && this.colorManager.input !== 'chip') { |