From b939a27a8dcdbd6a405a270784692ad226a84d8b Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 25 Jan 2016 18:40:28 +0100 Subject: [PATCH] revert f3bc726001bfbc707597bce5fa169b46e992eb7ao This change have caused alot of questions. So we revert --- public/app/plugins/panel/graph/graph_tooltip.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/public/app/plugins/panel/graph/graph_tooltip.js b/public/app/plugins/panel/graph/graph_tooltip.js index 99fb20b2ed5..1eabbd0f7af 100644 --- a/public/app/plugins/panel/graph/graph_tooltip.js +++ b/public/app/plugins/panel/graph/graph_tooltip.js @@ -79,9 +79,9 @@ function ($) { // Stacked series can increase its length on each new stacked serie if null points found, // to speed the index search we begin always on the last found hoverIndex. var newhoverIndex = this.findHoverIndexFromDataPoints(pos.x, series, hoverIndex); - results.push({ value: value, hoverIndex: newhoverIndex, color: series.color, label: series.label }); + results.push({ value: value, hoverIndex: newhoverIndex }); } else { - results.push({ value: value, hoverIndex: hoverIndex, color: series.color, label: series.label }); + results.push({ value: value, hoverIndex: hoverIndex }); } } @@ -126,8 +126,6 @@ function ($) { relativeTime = dashboard.getRelativeTime(seriesHoverInfo.time); absoluteTime = dashboard.formatDate(seriesHoverInfo.time); - seriesHoverInfo.sort(byToolTipValue); - for (i = 0; i < seriesHoverInfo.length; i++) { hoverInfo = seriesHoverInfo[i]; @@ -140,7 +138,7 @@ function ($) { value = series.formatValue(hoverInfo.value); seriesHtml += '
'; - seriesHtml += ' ' + hoverInfo.label + ':
'; + seriesHtml += ' ' + series.label + ':
'; seriesHtml += '
' + value + '
'; plot.highlight(i, hoverInfo.hoverIndex); } @@ -176,9 +174,5 @@ function ($) { }); } - function byToolTipValue(a, b) { - return parseFloat(b.value) - parseFloat(a.value); - } - return GraphTooltip; });