Merge pull request #2991 from tiagoroldao/issue-2990

Check for existence of data element before accessing property
chartjs · Jul 18, 2016 · 41ec60f · 41ec60f
2 parents 7930137 + 9df06e8
commit 41ec60f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/core/core.controller.js b/src/core/core.controller.js
@@ -413,9 +413,10 @@ module.exports = function(Chart) {
 
 			helpers.each(me.data.datasets, function(dataset, datasetIndex) {
 				if (me.isDatasetVisible(datasetIndex)) {
-					var meta = me.getDatasetMeta(datasetIndex);
-					if(!meta.data[found._index]._view.skip){
-						elementsArray.push(meta.data[found._index]);
+					var meta = me.getDatasetMeta(datasetIndex),
+						element = meta.data[found._index];
+					if(element && !element._view.skip){
+						elementsArray.push(element);
 					}
 				}
 			}, me);