Better handling when data.datasets does not exist

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 63bfe522f1c09917fdbf8c4b2535313e7a6355af..fb635453f77436b7f81478690c2d9110e47b740b 100644 (file)
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -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];
+                                                               }
                                                        }
                                                }
                                        }

diff --git a/src/core/core.legend.js b/src/core/core.legend.js
index 0f7468809d01dedaf71b906e0d33774acfc54470..4c0ea48761f462dd19d246bf278e7c6a213950a5 100644 (file)
--- a/src/core/core.legend.js
+++ b/src/core/core.legend.js
@@ -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) : [];
                        }
                }
        };