diff options
author | Jose Antonio Marquez | 2012-06-28 11:21:40 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-28 11:21:40 -0700 |
commit | 769d3e569ca58acff5ff3530bca8998459f2f08d (patch) | |
tree | ebaeff27ea7556f812474ac7dd2ed2e5e7baf589 /js/panels/color | |
parent | e46d1e54c2eac20488e7f3e2fa6c7d49ddfaaef1 (diff) | |
download | ninja-769d3e569ca58acff5ff3530bca8998459f2f08d.tar.gz |
Fixing chips updating with alpha change
Diffstat (limited to 'js/panels/color')
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/colorpanelbase.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js index 855d4afa..5ac93dbc 100755 --- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js +++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js | |||
@@ -260,7 +260,7 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
260 | return; | 260 | return; |
261 | } | 261 | } |
262 | //Checking for event mode to be color change (NOT PANEL MODE RELATED) | 262 | //Checking for event mode to be color change (NOT PANEL MODE RELATED) |
263 | if (e._event.mode === 'hsv' || e._event.mode === 'hsl' || e._event.mode === 'rgb' || e._event.mode === 'hex' || e._event.mode === 'nocolor' || e._event.mode === 'gradient') { | 263 | if (e._event.mode === 'hsv' || e._event.mode === 'hsl' || e._event.mode === 'rgb' || e._event.mode === 'hex' || e._event.mode === 'nocolor' || e._event.mode === 'gradient' || e._event.mode === 'alpha') { |
264 | //Checking for panel color mode (RGB or HSL) to assign correct slider values | 264 | //Checking for panel color mode (RGB or HSL) to assign correct slider values |
265 | if (this.panelMode === 'rgb' && e._event.rgba) { | 265 | if (this.panelMode === 'rgb' && e._event.rgba) { |
266 | this._combo[0].slider.value = e._event.rgba.r; | 266 | this._combo[0].slider.value = e._event.rgba.r; |
@@ -1019,7 +1019,7 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
1019 | } | 1019 | } |
1020 | } else { | 1020 | } else { |
1021 | // | 1021 | // |
1022 | update = { value: this._combo[3][type].value / 100, wasSetByCode: false, type: 'change' }; | 1022 | update = { value: this._combo[3][type].value/100, wasSetByCode: false, type: 'change' }; |
1023 | // | 1023 | // |
1024 | this.colorManager.alpha = update; | 1024 | this.colorManager.alpha = update; |
1025 | } | 1025 | } |