From: etimberg <evert.timberg@gmail.com>
Date: Wed, 30 Mar 2016 00:10:29 +0000 (-0400)
Subject: Better handling when data.datasets does not exist
X-Git-Tag: v2.0.0~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2186%2Fhead;p=thirdparty%2FChart.js.git

Better handling when data.datasets does not exist
---

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 63bfe522f..fb635453f 100644
--- 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 0f7468809..4c0ea4876 100644
--- 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) : [];
 			}
 		}
 	};