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

Assign unique scale IDs (#6291)

Browse Source
This commit is contained in:
Akihiko Kusanagi 2019-06-09 15:45:12 +08:00 committed by GitHub
parent 70b32ff20e
commit bf094c59db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,19 @@ function updateConfig(chart) {
chart.tooltip.initialize();
}
function nextAvailableScaleId(axesOpts, prefix, index) {
var id;
var hasId = function(obj) {
return obj.id === id;
};
do {
id = prefix + index++;
} while (helpers.findIndex(axesOpts, hasId) >= 0);
return id;
}
function positionIsHorizontal(position) {
return position === 'top' || position === 'bottom';
}
@ -295,11 +308,15 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
var scaleOptions = options.scale;
helpers.each(scalesOptions.xAxes, function(xAxisOptions, index) {
xAxisOptions.id = xAxisOptions.id || ('x-axis-' + index);
if (!xAxisOptions.id) {
xAxisOptions.id = nextAvailableScaleId(scalesOptions.xAxes, 'x-axis-', index);
}
});
helpers.each(scalesOptions.yAxes, function(yAxisOptions, index) {
yAxisOptions.id = yAxisOptions.id || ('y-axis-' + index);
if (!yAxisOptions.id) {
yAxisOptions.id = nextAvailableScaleId(scalesOptions.yAxes, 'y-axis-', index);
}
});
if (scaleOptions) {

17
test/specs/core.controller.tests.js
View File

@ -1059,6 +1059,23 @@ describe('Chart', function() {
expect(yScale.options.ticks.max).toBe(10);
});
it ('should assign unique scale IDs', function() {
var chart = acquireChart({
type: 'line',
options: {
scales: {
xAxes: [{id: 'x-axis-0'}, {}, {}],
yAxes: [{id: 'y-axis-1'}, {}, {}]
}
}
});
expect(Object.keys(chart.scales).sort()).toEqual([
'x-axis-0', 'x-axis-1', 'x-axis-2',
'y-axis-1', 'y-axis-2', 'y-axis-3'
]);
});
it ('should remove discarded scale', function() {
var chart = acquireChart({
type: 'line',