archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2186 from nnnick/fix/2115

Browse Source 
Better handling when data.datasets does not exist
This commit is contained in:
Evert Timberg 2016-03-29 20:13:42 -04:00
commit 37da19df78
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/core.controller.js
View File

@ -347,11 +347,13 @@ module.exports = function(Chart) {
var elementsArray = [];
var found = (function() {
for (var i = 0; i < this.data.datasets.length; i++) {
if (helpers.isDatasetVisible(this.data.datasets[i])) {
for (var j = 0; j < this.data.datasets[i].metaData.length; j++) {
if (this.data.datasets[i].metaData[j].inRange(eventPosition.x, eventPosition.y)) {
return this.data.datasets[i].metaData[j];
if (this.data.datasets) {
for (var i = 0; i < this.data.datasets.length; i++) {
if (helpers.isDatasetVisible(this.data.datasets[i])) {
for (var j = 0; j < this.data.datasets[i].metaData.length; j++) {
if (this.data.datasets[i].metaData[j].inRange(eventPosition.x, eventPosition.y)) {
return this.data.datasets[i].metaData[j];
}
}
}
}

4
src/core/core.legend.js
View File

@ -35,7 +35,7 @@ module.exports = function(Chart) {
// lineJoin :
// lineWidth :
generateLabels: function(data) {
return data.datasets.map(function(dataset, i) {
return helpers.isArray(data.datasets) ? data.datasets.map(function(dataset, i) {
return {
text: dataset.label,
fillStyle: dataset.backgroundColor,
@ -50,7 +50,7 @@ module.exports = function(Chart) {
// Below is extra data used for toggling the datasets
datasetIndex: i
};
}, this);
}, this) : [];
}
}
};