From 9589953c022105681fbfcded069f65fd3b6a5976 Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Sat, 9 Nov 2019 02:59:05 +0200 Subject: [PATCH] Context compatibility with dataLabels (#6713) * Context compatibility with dataLabels * document * THe + wording --- docs/getting-started/v3-migration.md | 1 + src/core/core.datasetController.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/getting-started/v3-migration.md b/docs/getting-started/v3-migration.md index 2d27abdb0..51035bc90 100644 --- a/docs/getting-started/v3-migration.md +++ b/docs/getting-started/v3-migration.md @@ -27,6 +27,7 @@ Chart.js is no longer providing the `Chart.bundle.js` and `Chart.bundle.min.js`. * `custom` attribute of elements was removed. Please use scriptable options * The `zeroLine*` options of axes were removed. +* The `hover` property of scriptable options `context` object was renamed to `active` to align it with the datalabels plugin. ### Options diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js index 70fdefe53..cc9601ec3 100644 --- a/src/core/core.datasetController.js +++ b/src/core/core.datasetController.js @@ -704,7 +704,7 @@ helpers.extend(DatasetController.prototype, { /** * @private */ - _resolveDatasetElementOptions: function(hover) { + _resolveDatasetElementOptions: function(active) { var me = this; var chart = me.chart; var datasetOpts = me._config; @@ -715,15 +715,15 @@ helpers.extend(DatasetController.prototype, { // Scriptable options var context = { - chart: chart, + chart, dataset: me.getDataset(), datasetIndex: me.index, - hover: hover + active }; for (i = 0, ilen = elementOptions.length; i < ilen; ++i) { key = elementOptions[i]; - readKey = hover ? 'hover' + key.charAt(0).toUpperCase() + key.slice(1) : key; + readKey = active ? 'hover' + key.charAt(0).toUpperCase() + key.slice(1) : key; values[key] = resolve([ datasetOpts[readKey], options[readKey]