IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Missing values, corect tooltip

Browse Source
This commit is contained in:
benrubson
2016-10-16 00:30:50 +02:00
parent 07bf4c0b82
commit 604dcbc6b2
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/plugins/panel/graph/graph_tooltip.js
View File

@@ -17,7 +17,7 @@ function ($, _) {
var initial = last*ps;
var len = series.datapoints.points.length;
for (var j = initial; j < len; j += ps) {
if ((series.datapoints.points[initial] != null && series.datapoints.points[j] == null) || series.datapoints.points[j] > posX) {
if ((series.datapoints.points[initial] != null && series.datapoints.points[j] == null && ! series.lines.steps) || series.datapoints.points[j] > posX) {
return Math.max(j - ps, 0)/ps;
}
}
@@ -61,7 +61,7 @@ function ($, _) {
}
hoverIndex = this.findHoverIndexFromData(pos.x, series);
hoverDistance = Math.abs(pos.x - series.data[hoverIndex][0]);
hoverDistance = pos.x - series.data[hoverIndex][0];
pointTime = series.data[hoverIndex][0];
if (series.stack) {
@@ -102,9 +102,6 @@ function ($, _) {
});
}
// Find point which closer to pointer
results.time = _.min(results, 'distance').time;
return results;
};
@@ -174,7 +171,7 @@ function ($, _) {
continue;
}
if (! distance || hoverInfo.distance < distance) {
if (! distance || (hoverInfo.distance >=0 && (hoverInfo.distance < distance || distance < 0)) || (hoverInfo.distance < 0 && hoverInfo.distance > distance)) {
distance = hoverInfo.distance;
time = hoverInfo.time;
}