From f3e06afdb17dcedf8de6e1be1e770ea9cf15abbb Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 7 May 2019 14:42:29 -0700 Subject: [PATCH] Remove unnecessary checks for hidden data --- src/scales/scale.linear.js | 6 +++--- src/scales/scale.logarithmic.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js index a2199b66e78..f99496aac08 100644 --- a/src/scales/scale.linear.js +++ b/src/scales/scale.linear.js @@ -71,7 +71,7 @@ module.exports = LinearScaleBase.extend({ if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) { helpers.each(dataset.data, function(rawValue, index) { var value = +me.getRightValue(rawValue); - if (isNaN(value) || meta.data[index].hidden) { + if (isNaN(value)) { return; } @@ -101,9 +101,9 @@ module.exports = LinearScaleBase.extend({ helpers.each(datasets, function(dataset, datasetIndex) { var meta = chart.getDatasetMeta(datasetIndex); if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) { - helpers.each(dataset.data, function(rawValue, index) { + helpers.each(dataset.data, function(rawValue) { var value = +me.getRightValue(rawValue); - if (isNaN(value) || meta.data[index].hidden) { + if (isNaN(value)) { return; } diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js index fd67f0b19a4..960f371ad45 100644 --- a/src/scales/scale.logarithmic.js +++ b/src/scales/scale.logarithmic.js @@ -119,8 +119,8 @@ module.exports = Scale.extend({ helpers.each(dataset.data, function(rawValue, index) { var values = valuesPerStack[key]; var value = +me.getRightValue(rawValue); - // invalid, hidden and negative values are ignored - if (isNaN(value) || meta.data[index].hidden || value < 0) { + // invalid values are ignored + if (isNaN(value) || value < 0) { return; } values[index] = values[index] || 0; @@ -142,10 +142,10 @@ module.exports = Scale.extend({ helpers.each(datasets, function(dataset, datasetIndex) { var meta = chart.getDatasetMeta(datasetIndex); if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) { - helpers.each(dataset.data, function(rawValue, index) { + helpers.each(dataset.data, function(rawValue) { var value = +me.getRightValue(rawValue); - // invalid, hidden and negative values are ignored - if (isNaN(value) || meta.data[index].hidden || value < 0) { + // invalid values are ignored + if (isNaN(value) || value < 0) { return; }