committed by
Torkel Ödegaard
parent
497993e2b2
commit
948a5259a2
@@ -43,7 +43,7 @@ export class SeriesColorPicker extends React.Component<IProps, any> {
|
|||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="graph-legend-popover">
|
<div className="graph-legend-popover">
|
||||||
{this.props.series && this.renderAxisSelection()}
|
{this.props.series.yaxis && this.renderAxisSelection()}
|
||||||
<ColorPickerPopover color={this.props.series.color} onColorSelect={this.onColorChange} />
|
<ColorPickerPopover color={this.props.series.color} onColorSelect={this.onColorChange} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ define([
|
|||||||
$scope.setOverride = function(item, subItem) {
|
$scope.setOverride = function(item, subItem) {
|
||||||
// handle color overrides
|
// handle color overrides
|
||||||
if (item.propertyName === 'color') {
|
if (item.propertyName === 'color') {
|
||||||
$scope.openColorSelector();
|
$scope.openColorSelector($scope.override['color']);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,15 +52,17 @@ define([
|
|||||||
$scope.ctrl.render();
|
$scope.ctrl.render();
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.openColorSelector = function() {
|
$scope.openColorSelector = function(color) {
|
||||||
|
var fakeSeries = {color: color};
|
||||||
popoverSrv.show({
|
popoverSrv.show({
|
||||||
element: $element.find(".dropdown")[0],
|
element: $element.find(".dropdown")[0],
|
||||||
position: 'top center',
|
position: 'top center',
|
||||||
openOn: 'click',
|
openOn: 'click',
|
||||||
template: '<series-color-picker onColorChange="colorSelected" />',
|
template: '<series-color-picker series="series" onColorChange="colorSelected" />',
|
||||||
model: {
|
model: {
|
||||||
autoClose: true,
|
autoClose: true,
|
||||||
colorSelected: $scope.colorSelected,
|
colorSelected: $scope.colorSelected,
|
||||||
|
series: fakeSeries
|
||||||
},
|
},
|
||||||
onClose: function() {
|
onClose: function() {
|
||||||
$scope.ctrl.render();
|
$scope.ctrl.render();
|
||||||
|
|||||||
Reference in New Issue
Block a user