add check for datasets values in doughnut and polar area

chartjs · May 10, 2019 · 4745b7d · 4745b7d
1 parent 1a01415
commit 4745b7d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
@@ -22,18 +22,20 @@ defaults._set('doughnut', {
 		var list = document.createElement('ul');
 		var data = chart.data;
 		var datasets = data.datasets;
-		var labels = data.labels;
 
-		var i, ilen, listItem, listItemSpan;
+		if (datasets.length) {
+			var labels = data.labels;
+			var i, ilen, listItem, listItemSpan;
 
-		list.setAttribute('class', chart.id + '-legend');
+			list.setAttribute('class', chart.id + '-legend');
 
-		for (i = 0, ilen = datasets[0].data.length || 0; i < ilen; ++i) {
-			listItem = list.appendChild(document.createElement('li'));
-			listItemSpan = listItem.appendChild(document.createElement('span'));
-			listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
-			if (labels[i]) {
-				listItem.appendChild(document.createTextNode(labels[i]));
+			for (i = 0, ilen = datasets[0].data.length; i < ilen; ++i) {
+				listItem = list.appendChild(document.createElement('li'));
+				listItemSpan = listItem.appendChild(document.createElement('span'));
+				listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
+				if (labels[i]) {
+					listItem.appendChild(document.createTextNode(labels[i]));
+				}
 			}
 		}
 

diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
@@ -35,18 +35,20 @@ defaults._set('polarArea', {
 		var list = document.createElement('ul');
 		var data = chart.data;
 		var datasets = data.datasets;
-		var labels = data.labels;
 
-		var i, ilen, listItem, listItemSpan;
+		if (datasets.length) {
+			var labels = data.labels;
+			var i, ilen, listItem, listItemSpan;
 
-		list.setAttribute('class', chart.id + '-legend');
+			list.setAttribute('class', chart.id + '-legend');
 
-		for (i = 0, ilen = datasets[0].data.length || 0; i < ilen; ++i) {
-			listItem = list.appendChild(document.createElement('li'));
-			listItemSpan = listItem.appendChild(document.createElement('span'));
-			listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
-			if (labels[i]) {
-				listItem.appendChild(document.createTextNode(labels[i]));
+			for (i = 0, ilen = datasets[0].data.length; i < ilen; ++i) {
+				listItem = list.appendChild(document.createElement('li'));
+				listItemSpan = listItem.appendChild(document.createElement('span'));
+				listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
+				if (labels[i]) {
+					listItem.appendChild(document.createTextNode(labels[i]));
+				}
 			}
 		}