]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
fix for null tooltip bug 2883/head
authorAdam Templeton <claytemple@gmail.com>
Thu, 30 Jun 2016 16:34:53 +0000 (11:34 -0500)
committerAdam Templeton <claytemple@gmail.com>
Thu, 30 Jun 2016 16:34:53 +0000 (11:34 -0500)
src/core/core.controller.js

index 28de61bd787df6d06bedcb3a7f44652581cdb992..4794cf80a6716982c9f932963604a4e20c048782 100644 (file)
@@ -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);