From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sat, 10 Sep 2016 01:03:59 +0000 (-0400)
Subject: When the category scale is used as the non main scale, return the correct data for... 
X-Git-Tag: v2.3.0-rc.1~1^2~9^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F3284%2Fhead;p=thirdparty%2FChart.js.git

When the category scale is used as the non main scale, return the correct data for the tooltip
---

diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index 7767ef58d..6d9c33b64 100644
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -49,8 +49,16 @@ module.exports = function(Chart) {
 			me.ticks = (me.minIndex === 0 && me.maxIndex === labels.length - 1) ? labels : labels.slice(me.minIndex, me.maxIndex + 1);
 		},
 
-		getLabelForIndex: function(index) {
-			return this.ticks[index];
+		getLabelForIndex: function(index, datasetIndex) {
+			var me = this;
+			var data = me.chart.data;
+			var isHorizontal = me.isHorizontal();
+
+			if ((data.xLabels && isHorizontal) || (data.yLabels && !isHorizontal)) {
+				return me.getRightValue(data.datasets[datasetIndex].data[index]);
+			} else {
+				return me.ticks[index];
+			}
 		},
 
 		// Used to get data value locations.  Value can either be an index or a numerical value