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

Use consistent option context for scales (#7499)

Browse Source
This commit is contained in:
Evert Timberg 2020-06-12 18:01:48 -04:00 committed by GitHub
parent d0d9d7dd5c
commit fc65679a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/core.scale.js
View File

@ -1119,8 +1119,10 @@ export default class Scale extends Element {
const items = [];
let context = {
chart,
scale: me,
tick: ticks[0],
index: 0,
};
const axisWidth = gridLines.drawBorder ? resolve([gridLines.borderWidth, gridLines.lineWidth, 0], context, 0) : 0;
const axisHalfWidth = axisWidth / 2;
@ -1187,8 +1189,10 @@ export default class Scale extends Element {
const tick = ticks[i] || {};
context = {
chart,
scale: me,
tick,
index: i,
};
const lineWidth = resolve([gridLines.lineWidth], context, i);
@ -1328,8 +1332,10 @@ export default class Scale extends Element {
const ctx = me.ctx;
const chart = me.chart;
let context = {
chart,
scale: me,
tick: me.ticks[0],
index: 0,
};
const axisWidth = gridLines.drawBorder ? resolve([gridLines.borderWidth, gridLines.lineWidth, 0], context, 0) : 0;
const items = me._gridLineItems || (me._gridLineItems = me._computeGridLineItems(chartArea));
@ -1372,8 +1378,10 @@ export default class Scale extends Element {
// Draw the line at the edge of the axis
const firstLineWidth = axisWidth;
context = {
chart,
scale: me,
tick: me.ticks[me._ticksLength - 1],
index: me._ticksLength - 1,
};
const lastLineWidth = resolve([gridLines.lineWidth, 1], context, me._ticksLength - 1);
const borderValue = me._borderValue;