From: Jukka Kurkela Date: Sat, 23 Nov 2019 22:38:48 +0000 (+0200) Subject: Use correct dataset index in parseVisibleItems (#6786) X-Git-Tag: v3.0.0-alpha~215 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eed101a53c424e9c37debd8669d4cadb495448e;p=thirdparty%2FChart.js.git Use correct dataset index in parseVisibleItems (#6786) * Use correct dataset index * Review1 --- diff --git a/src/core/core.interaction.js b/src/core/core.interaction.js index a558d8b20..792ce2ecb 100644 --- a/src/core/core.interaction.js +++ b/src/core/core.interaction.js @@ -25,15 +25,15 @@ function getRelativePosition(e, chart) { * @param {function} handler - the callback to execute for each visible item */ function parseVisibleItems(chart, handler) { - var metasets = chart._getSortedVisibleDatasetMetas(); - var metadata, i, j, ilen, jlen, element; + const metasets = chart._getSortedVisibleDatasetMetas(); + let index, data, element; - for (i = 0, ilen = metasets.length; i < ilen; ++i) { - metadata = metasets[i].data; - for (j = 0, jlen = metadata.length; j < jlen; ++j) { - element = metadata[j]; + for (let i = 0, ilen = metasets.length; i < ilen; ++i) { + ({index, data} = metasets[i]); + for (let j = 0, jlen = data.length; j < jlen; ++j) { + element = data[j]; if (!element._view.skip) { - handler(element, i, j); + handler(element, index, j); } } }