diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e581fe05b8..cbf3cb542cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 1.9.1 (unreleased) + +**Fixes** +- [Issue #1199](https://github.com/grafana/grafana/issues/1199). Graph: fix for series tooltip when one series is hidden/disabled + # 1.9.0 (2014-12-02) **Enhancements** diff --git a/src/app/panels/graph/graph.tooltip.js b/src/app/panels/graph/graph.tooltip.js index 4c5f727f919..9100fed47cf 100644 --- a/src/app/panels/graph/graph.tooltip.js +++ b/src/app/panels/graph/graph.tooltip.js @@ -99,9 +99,9 @@ function ($) { lasthoverIndex = hoverIndex; } - results.push({ value: value, hoverIndex: newhoverIndex }); + results.push({ value: value, hoverIndex: newhoverIndex, series: series }); } else { - results.push({ value: value, hoverIndex: hoverIndex }); + results.push({ value: value, hoverIndex: hoverIndex, series: series }); } } @@ -149,8 +149,8 @@ function ($) { timestamp = dashboard.formatDate(seriesHoverInfo.time); for (i = 0; i < seriesHoverInfo.length; i++) { - series = seriesList[i]; hoverInfo = seriesHoverInfo[i]; + series = hoverInfo.series; value = series.formatValue(hoverInfo.value); seriesHtml += '<div class="graph-tooltip-list-item"><div class="graph-tooltip-series-name">'; diff --git a/src/vendor/angular/angular-dragdrop.js b/src/vendor/angular/angular-dragdrop.js index 5eb196409e7..40fb1c9e814 100644 --- a/src/vendor/angular/angular-dragdrop.js +++ b/src/vendor/angular/angular-dragdrop.js @@ -39,7 +39,6 @@ angular.module("ang-drag-drop",[]) element.attr("draggable", false); attrs.$observe("uiDraggable", function (newValue) { - console.log(newValue); if(newValue){ element.attr("draggable", newValue); }