From dc0dc0b76e8a6d0cbdd6bc46e91fc07c3dcbc078 Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Fri, 16 Mar 2012 00:13:40 +0000 Subject: [PATCH] [view/flot-graph][s]: tool tips now show true x-axis value in case where non-numeric (e.g. for bar). --- src/view-flot-graph.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/view-flot-graph.js b/src/view-flot-graph.js index 5429eed4..11fe4030 100644 --- a/src/view-flot-graph.js +++ b/src/view-flot-graph.js @@ -220,12 +220,19 @@ my.FlotGraph = Backbone.View.extend({ var previousPoint = null; this.$graph.bind("plothover", function (event, pos, item) { if (item) { - if (previousPoint != item.dataIndex) { - previousPoint = item.dataIndex; + if (previousPoint != item.datapoint) { + previousPoint = item.datapoint; $("#flot-tooltip").remove(); - var x = item.datapoint[0].toFixed(2), - y = item.datapoint[1].toFixed(2); + var x = item.datapoint[0]; + var y = item.datapoint[1]; + // convert back from 'index' value on x-axis (e.g. in cases where non-number values) + if (self.model.currentDocuments.models[x]) { + x = self.model.currentDocuments.models[x].get(self.chartConfig.group); + } else { + x = x.toFixed(2); + } + y = y.toFixed(2); var content = _.template('<%= group %> = <%= x %>, <%= series %> = <%= y %>', { group: self.chartConfig.group,