mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Graph: fix for series tooltip when one series is hidden/disabled, #1199
This commit is contained in:
parent
982a5b1a39
commit
69d56b8ed7
@ -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**
|
||||
|
@ -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">';
|
||||
|
1
src/vendor/angular/angular-dragdrop.js
vendored
1
src/vendor/angular/angular-dragdrop.js
vendored
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user