mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
fix(): fixed issue with series override color selector when using the mouse to select color option, fixes #4620
This commit is contained in:
parent
1a29a769c6
commit
52e2091f2c
@ -46,9 +46,12 @@ function popoverSrv($compile, $rootScope) {
|
|||||||
drop.on('close', () => {
|
drop.on('close', () => {
|
||||||
popoverScope.dismiss({fromDropClose: true});
|
popoverScope.dismiss({fromDropClose: true});
|
||||||
destroyDrop();
|
destroyDrop();
|
||||||
|
if (options.onClose) {
|
||||||
|
options.onClose();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
drop.open();
|
setTimeout(() => { drop.open(); }, 10);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,6 +60,9 @@ define([
|
|||||||
template: '<gf-color-picker></gf-color-picker>',
|
template: '<gf-color-picker></gf-color-picker>',
|
||||||
model: {
|
model: {
|
||||||
colorSelected: $scope.colorSelected,
|
colorSelected: $scope.colorSelected,
|
||||||
|
},
|
||||||
|
onClose: function() {
|
||||||
|
$scope.ctrl.seriesOverrideChanged();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -22,6 +22,7 @@ define([
|
|||||||
ctx.scope.ctrl = {
|
ctx.scope.ctrl = {
|
||||||
refresh: sinon.spy(),
|
refresh: sinon.spy(),
|
||||||
render: sinon.spy(),
|
render: sinon.spy(),
|
||||||
|
seriesOverrideChanged: sinon.spy(),
|
||||||
seriesList: []
|
seriesList: []
|
||||||
};
|
};
|
||||||
ctx.scope.render = function() {};
|
ctx.scope.render = function() {};
|
||||||
|
Loading…
Reference in New Issue
Block a user