Commit 69d56b8e by Torkel Ödegaard

Graph: fix for series tooltip when one series is hidden/disabled, #1199

parent 982a5b1a
# 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) # 1.9.0 (2014-12-02)
**Enhancements** **Enhancements**
......
...@@ -99,9 +99,9 @@ function ($) { ...@@ -99,9 +99,9 @@ function ($) {
lasthoverIndex = hoverIndex; lasthoverIndex = hoverIndex;
} }
results.push({ value: value, hoverIndex: newhoverIndex }); results.push({ value: value, hoverIndex: newhoverIndex, series: series });
} else { } else {
results.push({ value: value, hoverIndex: hoverIndex }); results.push({ value: value, hoverIndex: hoverIndex, series: series });
} }
} }
...@@ -149,8 +149,8 @@ function ($) { ...@@ -149,8 +149,8 @@ function ($) {
timestamp = dashboard.formatDate(seriesHoverInfo.time); timestamp = dashboard.formatDate(seriesHoverInfo.time);
for (i = 0; i < seriesHoverInfo.length; i++) { for (i = 0; i < seriesHoverInfo.length; i++) {
series = seriesList[i];
hoverInfo = seriesHoverInfo[i]; hoverInfo = seriesHoverInfo[i];
series = hoverInfo.series;
value = series.formatValue(hoverInfo.value); value = series.formatValue(hoverInfo.value);
seriesHtml += '<div class="graph-tooltip-list-item"><div class="graph-tooltip-series-name">'; seriesHtml += '<div class="graph-tooltip-list-item"><div class="graph-tooltip-series-name">';
......
...@@ -39,7 +39,6 @@ angular.module("ang-drag-drop",[]) ...@@ -39,7 +39,6 @@ angular.module("ang-drag-drop",[])
element.attr("draggable", false); element.attr("draggable", false);
attrs.$observe("uiDraggable", function (newValue) { attrs.$observe("uiDraggable", function (newValue) {
console.log(newValue);
if(newValue){ if(newValue){
element.attr("draggable", newValue); element.attr("draggable", newValue);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment