From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Fri, 12 Jun 2020 22:01:48 +0000 (-0400)
Subject: Use consistent option context for scales (#7499)
X-Git-Tag: v3.0.0-beta.2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc65679a07d2d0ab20e252cee292c671569e9aab;p=thirdparty%2FChart.js.git

Use consistent option context for scales (#7499)
---

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 5e3640856..c7fc1e45d 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -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;