IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 13:09:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(graph): fixed for color picker layout issue when right side legend was used, fixes #3093

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-10-30 09:30:48 +01:00
parent 6004ba6554
commit 4dcd2ceb01
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@
* **cloudwatch**: fix for handling of period for long time ranges, fixes [#3086](https://github.com/grafana/grafana/issues/3086) * **cloudwatch**: fix for handling of period for long time ranges, fixes [#3086](https://github.com/grafana/grafana/issues/3086)
* **dashboard**: fix for collapse row by clicking on row title, fixes [#3065](https://github.com/grafana/grafana/issues/3065) * **dashboard**: fix for collapse row by clicking on row title, fixes [#3065](https://github.com/grafana/grafana/issues/3065)
* **influxdb**: fix for relative time ranges `last x months` and `last x years`, fixes [#3067](https://github.com/grafana/grafana/issues/3067) * **influxdb**: fix for relative time ranges `last x months` and `last x years`, fixes [#3067](https://github.com/grafana/grafana/issues/3067)
* **graph**: layout fix for color picker when right side legend was enabled, fixes [#3093](https://github.com/grafana/grafana/issues/3093)
# 2.5 (2015-10-28) # 2.5 (2015-10-28)

7
public/app/panels/graph/legend.js
View File

@ -34,7 +34,12 @@ function (angular, _, kbn, $) {
} }
function openColorSelector(e) { function openColorSelector(e) {
var el = $(e.currentTarget); // if we clicked inside poup container ignore click
if ($(e.target).parents('.popover').length) {
return;
}
var el = $(e.currentTarget).find('.fa-minus');
var index = getSeriesIndexForElement(el); var index = getSeriesIndexForElement(el);
var seriesInfo = seriesList[index]; var seriesInfo = seriesList[index];
var popoverScope = scope.$new(); var popoverScope = scope.$new();