Merge pull request #1741 from nnnick/fix/1706

Highlight correct items in dataset mode
This commit is contained in:
Evert Timberg
2015-12-05 10:01:03 -05:00
2 changed files with 6 additions and 15 deletions

View File

@@ -88,7 +88,7 @@
}
},
hover: {
mode: 'label'
mode: 'dataset'
},
scales: {
xAxes: [{

View File

@@ -331,22 +331,13 @@
},
getDatasetAtEvent: function(e) {
var eventPosition = helpers.getRelativePosition(e, this.chart);
var elementsArray = [];
var elementsArray = this.getElementAtEvent(e);
helpers.each(this.data.datasets, function(dataset, datasetIndex) {
if (helpers.isDatasetVisible(dataset)) {
helpers.each(dataset.metaData, function(element, elementIndex) {
if (element.inLabelRange(eventPosition.x, eventPosition.y)) {
helpers.each(dataset.metaData, function(element, index) {
elementsArray.push(element);
}, this);
}
}, this);
}
}, this);
if (elementsArray.length > 0) {
elementsArray = this.data.datasets[elementsArray[0]._datasetIndex].metaData;
}
return elementsArray.length ? elementsArray : [];
return elementsArray;
},
generateLegend: function generateLegend() {