IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Series color picker fix (#9442)

Browse Source 
* colorpicker: fix spectrum color update on series color picker

* colorpicker: minor refactor
This commit is contained in:
Alexander Zobnin 2017-10-05 19:34:12 +03:00 committed by Torkel Ödegaard
parent 9b34346f6b
commit 19b5d91b75
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/colorpicker/ColorPickerPopover.tsx
View File

@ -88,7 +88,7 @@ export class ColorPickerPopover extends React.Component<IProps, any> {
); );
const spectrumTab = ( const spectrumTab = (
<div id="spectrum"> <div id="spectrum">
<GfSpectrumPicker color={this.props.color} onColorSelect={this.spectrumColorSelected.bind(this)} options={{}} /> <GfSpectrumPicker color={this.state.color} onColorSelect={this.spectrumColorSelected.bind(this)} options={{}} />
</div> </div>
); );
const currentTab = this.state.tab === 'palette' ? paletteTab : spectrumTab; const currentTab = this.state.tab === 'palette' ? paletteTab : spectrumTab;

2
public/app/core/components/colorpicker/SeriesColorPicker.tsx
View File

@ -44,7 +44,7 @@ export class SeriesColorPicker extends React.Component<IProps, any> {
return ( return (
<div className="graph-legend-popover"> <div className="graph-legend-popover">
{this.props.series && this.renderAxisSelection()} {this.props.series && this.renderAxisSelection()}
<ColorPickerPopover color="#7EB26D" onColorSelect={this.onColorChange} /> <ColorPickerPopover color={this.props.series.color} onColorSelect={this.onColorChange} />
</div> </div>
); );
} }