From: Adam Templeton <claytemple@gmail.com>
Date: Thu, 30 Jun 2016 16:34:53 +0000 (-0500)
Subject: fix for null tooltip bug
X-Git-Tag: v2.2.0-rc.1~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2883%2Fhead;p=thirdparty%2FChart.js.git

fix for null tooltip bug
---

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 28de61bd7..4794cf80a 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -414,7 +414,9 @@ module.exports = function(Chart) {
 			helpers.each(me.data.datasets, function(dataset, datasetIndex) {
 				if (me.isDatasetVisible(datasetIndex)) {
 					var meta = me.getDatasetMeta(datasetIndex);
-					elementsArray.push(meta.data[found._index]);
+					if(!meta.data[found._index]._view.skip){
+						elementsArray.push(meta.data[found._index]);
+					}
 				}
 			}, me);
 
@@ -448,7 +450,9 @@ module.exports = function(Chart) {
             helpers.each(me.data.datasets, function(dataset, datasetIndex) {
                 if (me.isDatasetVisible(datasetIndex)) {
                     var meta = me.getDatasetMeta(datasetIndex);
-                    elementsArray.push(meta.data[found._index]);
+                    if(!meta.data[found._index]._view.skip){
+                    	elementsArray.push(meta.data[found._index]);
+                    }
                 }
             }, me);