Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 20:29:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3284 from chartjs/fix/3278

Browse Source 
Return correct tooltip data in category scale when double category scale is used
This commit is contained in:
Evert Timberg 2016-09-11 07:46:06 -04:00 committed by GitHub
commit 1c831230e3
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scales/scale.category.js
View File

@ -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); me.ticks = (me.minIndex === 0 && me.maxIndex === labels.length - 1) ? labels : labels.slice(me.minIndex, me.maxIndex + 1);
}, },
getLabelForIndex: function(index) { getLabelForIndex: function(index, datasetIndex) {
return this.ticks[index]; 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 // Used to get data value locations. Value can either be an index or a numerical value