Fix legend generation when no datasets

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 92816a028a734b455a61a9bee40dad038dcdf1e4..c3c70f9682640554d46a6d4aa5b5d739e372deff 100644 (file)
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -35,16 +35,20 @@ module.exports = function(Chart) {
                legend: {
                        labels: {
                                generateLabels: function(data) {
-                                       return data.labels.map(function(label, i) {
-                                               return {
-                                                       text: label,
-                                                       fillStyle: data.datasets[0].backgroundColor[i],
-                                                       hidden: isNaN(data.datasets[0].data[i]),
-
-                                                       // Extra data used for toggling the correct item
-                                                       index: i
-                                               };
-                                       });
+                                       if (data.labels.length && data.datasets.length) {
+                                               return data.labels.map(function(label, i) {
+                                                       return {
+                                                               text: label,
+                                                               fillStyle: data.datasets[0].backgroundColor[i],
+                                                               hidden: isNaN(data.datasets[0].data[i]),
+
+                                                               // Extra data used for toggling the correct item
+                                                               index: i
+                                                       };
+                                               });
+                                       } else {
+                                               return [];
+                                       }
                                }
                        },
                        onClick: function(e, legendItem) {

diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 162d1620c05c93dc18eef1523af15834cebec232..1506f9da73e198c57076d0a85ecba2153827f9a4 100644 (file)
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -36,16 +36,20 @@ module.exports = function(Chart) {
                legend: {
                        labels: {
                                generateLabels: function(data) {
-                                       return data.labels.map(function(label, i) {
-                                               return {
-                                                       text: label,
-                                                       fillStyle: data.datasets[0].backgroundColor[i],
-                                                       hidden: isNaN(data.datasets[0].data[i]),
-
-                                                       // Extra data used for toggling the correct item
-                                                       index: i
-                                               };
-                                       });
+                                       if (data.labels.length && data.datasets.length) {
+                                               return data.labels.map(function(label, i) {
+                                                       return {
+                                                               text: label,
+                                                               fillStyle: data.datasets[0].backgroundColor[i],
+                                                               hidden: isNaN(data.datasets[0].data[i]),
+
+                                                               // Extra data used for toggling the correct item
+                                                               index: i
+                                                       };
+                                               });
+                                       } else {
+                                               return [];
+                                       }
                                }
                        },
                        onClick: function(e, legendItem) {