archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Config is no longer updated by options setter (#8516)

Browse Source
This commit is contained in:
Jukka Kurkela 2021-02-24 23:34:29 +02:00 committed by GitHub
parent b31352c665
commit 2edd07d724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/core.config.js
View File

@ -80,25 +80,21 @@ function mergeScaleConfig(config, options) {
return scales;
}
function initOptions(config, options) {
options = options || {};
function initOptions(config) {
const options = config.options || (config.options = {});
options.plugins = valueOrDefault(options.plugins, {});
options.scales = mergeScaleConfig(config, options);
return options;
}
function initConfig(config) {
config = config || {};
// Do NOT use mergeConfig for the data object because this method merges arrays
// and so would change references to labels and datasets, preventing data updates.
const data = config.data = config.data || {datasets: [], labels: []};
data.datasets = data.datasets || [];
data.labels = data.labels || [];
config.options = initOptions(config, config.options);
initOptions(config);
return config;
}
@ -150,14 +146,18 @@ export default class Config {
return this._config.options;
}
set options(options) {
this._config.options = options;
}
get plugins() {
return this._config.plugins;
}
update(options) {
update() {
const config = this._config;
this.clearCache();
config.options = initOptions(config, options);
initOptions(config);
}
clearCache() {

4
src/core/core.controller.js
View File

@ -159,7 +159,7 @@ class Chart {
}
set options(options) {
this.config.update(options);
this.config.options = options;
}
/**
@ -444,7 +444,7 @@ class Chart {
const me = this;
const config = me.config;
config.update(config.options);
config.update();
me._options = config.createResolver(config.chartOptionScopes(), me.getContext());
each(me.scales, (scale) => {