L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-80351 libraries: ChartJS axis options being ignored

Browse Source 
When chartJs was updated to version 3.8.0, chart axis were now accessed
as a object property instead of an array element. This solution aims to
update the way we set the axis properties, aiming to display the labels
and other properties.
This commit is contained in:
Pedro Jordao
2025-02-13 02:25:49 -03:00
parent 56a037e766
commit eb0342fa4f
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/amd/build/chart_output_chartjs.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
lib/amd/build/chart_output_chartjs.min.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
lib/amd/src/chart_output_chartjs.js
+4 -6
View File
@@ -226,11 +226,10 @@ define([
var axisLabels = axis.getLabels();
config.options.scales = config.options.scales || {};
config.options.scales.x = config.options.scales.x || {};
config.options.scales.x[i] = this._makeAxisConfig(axis, 'x', i);
config.options.scales.x = this._makeAxisConfig(axis, 'x', i);
if (axisLabels !== null) {
config.options.scales.x[i].ticks.callback = function(value, index) {
config.options.scales.x.ticks.callback = function(value, index) {
return axisLabels[index] || '';
};
}
@@ -241,11 +240,10 @@ define([
var axisLabels = axis.getLabels();
config.options.scales = config.options.scales || {};
config.options.scales.y = config.options.scales.yAxes || {};
config.options.scales.y[i] = this._makeAxisConfig(axis, 'y', i);
config.options.scales.y = this._makeAxisConfig(axis, 'y', i);
if (axisLabels !== null) {
config.options.scales.y[i].ticks.callback = function(value) {
config.options.scales.y.ticks.callback = function(value) {
return axisLabels[parseInt(value, 10)] || '';
};
}