From 4dcd2ceb0124f2667ef2bcb053a320398d6c24d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 30 Oct 2015 09:30:48 +0100 Subject: [PATCH] fix(graph): fixed for color picker layout issue when right side legend was used, fixes #3093 --- CHANGELOG.md | 1 + public/app/panels/graph/legend.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85b9a1121c8..4cc80e2d533 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * **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) * **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) diff --git a/public/app/panels/graph/legend.js b/public/app/panels/graph/legend.js index 8f64f6b4395..c659447a704 100644 --- a/public/app/panels/graph/legend.js +++ b/public/app/panels/graph/legend.js @@ -34,7 +34,12 @@ function (angular, _, kbn, $) { } 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 seriesInfo = seriesList[index]; var popoverScope = scope.$new();