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

Graph: hover tooltip and axis format units fix, bug introduced last week

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-12-18 09:12:36 +01:00
parent fed06ef97d
commit 731bb6ba03
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/panels/graph/graph.tooltip.js
View File

@ -70,7 +70,11 @@ function ($) {
for (i = 0; i < seriesList.length; i++) { for (i = 0; i < seriesList.length; i++) {
series = seriesList[i]; series = seriesList[i];
if (!series.data.length) { continue; }
if (!series.data.length) {
results.push({ hidden: true });
continue;
}
if (scope.panel.stack) { if (scope.panel.stack) {
if (scope.panel.tooltip.value_type === 'individual') { if (scope.panel.tooltip.value_type === 'individual') {
@ -99,9 +103,9 @@ function ($) {
lasthoverIndex = hoverIndex; lasthoverIndex = hoverIndex;
} }
results.push({ value: value, hoverIndex: newhoverIndex, series: series }); results.push({ value: value, hoverIndex: newhoverIndex});
} else { } else {
results.push({ value: value, hoverIndex: hoverIndex, series: series }); results.push({ value: value, hoverIndex: hoverIndex});
} }
} }
@ -150,7 +154,12 @@ function ($) {
for (i = 0; i < seriesHoverInfo.length; i++) { for (i = 0; i < seriesHoverInfo.length; i++) {
hoverInfo = seriesHoverInfo[i]; hoverInfo = seriesHoverInfo[i];
series = hoverInfo.series;
if (hoverInfo.hidden) {
continue;
}
series = seriesList[i];
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">';