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 #3063 from chartjs/fix/2631

Browse Source 
Handle possibility of a undefined arc element in the doughnut chart
This commit is contained in:
Evert Timberg 2016-07-30 09:52:46 -04:00 committed by GitHub
commit 7628d4c8f2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/controller.doughnut.js
View File

@ -46,7 +46,7 @@ module.exports = function(Chart) {
var meta = chart.getDatasetMeta(0); var meta = chart.getDatasetMeta(0);
var ds = data.datasets[0]; var ds = data.datasets[0];
var arc = meta.data[i]; var arc = meta.data[i];
var custom = arc.custom || {}; var custom = arc && arc.custom || {};
var getValueAtIndexOrDefault = helpers.getValueAtIndexOrDefault; var getValueAtIndexOrDefault = helpers.getValueAtIndexOrDefault;
var arcOpts = chart.options.elements.arc; var arcOpts = chart.options.elements.arc;
var fill = custom.backgroundColor ? custom.backgroundColor : getValueAtIndexOrDefault(ds.backgroundColor, i, arcOpts.backgroundColor); var fill = custom.backgroundColor ? custom.backgroundColor : getValueAtIndexOrDefault(ds.backgroundColor, i, arcOpts.backgroundColor);
@ -253,6 +253,10 @@ module.exports = function(Chart) {
} }
}); });
/*if (total === 0) {
total = NaN;
}*/
return total; return total;
}, },