From df72199dd6dce31f0f6beb174c6a7e06ea774a6e Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Sun, 30 May 2021 16:15:18 -0400 Subject: [PATCH 1/3] Tick backdrop padding is not scriptable --- docs/axes/_common_ticks.md | 2 +- src/core/core.scale.defaults.js | 5 +++++ src/scales/scale.radialLinear.js | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/axes/_common_ticks.md b/docs/axes/_common_ticks.md index 1c17aba395b..2a7c9512fa6 100644 --- a/docs/axes/_common_ticks.md +++ b/docs/axes/_common_ticks.md @@ -5,7 +5,7 @@ Namespace: `options.scales[scaleId].ticks` | Name | Type | Scriptable | Default | Description | ---- | ---- | :-------------------------------: | ------- | ----------- | `backdropColor` | [`Color`](../../general/colors.md) | Yes | `'rgba(255, 255, 255, 0.75)'` | Color of label backdrops. -| `backdropPadding` | [`Padding`](../../general/padding.md) | Yes | `2` | Padding of label backdrop. +| `backdropPadding` | [`Padding`](../../general/padding.md) | | `2` | Padding of label backdrop. | `callback` | `function` | | | Returns the string representation of the tick value as it should be displayed on the chart. See [callback](/axes/labelling.md#creating-custom-tick-formats). | `display` | `boolean` | | `true` | If true, show tick labels. | `color` | [`Color`](/general/colors.md) | Yes | `Chart.defaults.color` | Color of ticks. diff --git a/src/core/core.scale.defaults.js b/src/core/core.scale.defaults.js index 960d1794962..90498f43816 100644 --- a/src/core/core.scale.defaults.js +++ b/src/core/core.scale.defaults.js @@ -92,3 +92,8 @@ defaults.describe('scale', { defaults.describe('scales', { _fallback: 'scale', }); + +defaults.describe('scale.ticks', { + _scriptable: (name) => name !== 'backdropPadding', + _indexable: (name) => name !== 'backdropPadding', +}); diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js index 7be1d220c35..64f0ea88317 100644 --- a/src/scales/scale.radialLinear.js +++ b/src/scales/scale.radialLinear.js @@ -635,5 +635,5 @@ RadialLinearScale.defaultRoutes = { RadialLinearScale.descriptors = { angleLines: { _fallback: 'grid' - } + }, }; From 119c8f9dbe1e708f52337ada65294bf72177833b Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Sun, 30 May 2021 16:36:51 -0400 Subject: [PATCH 2/3] Remove unneeded change --- src/scales/scale.radialLinear.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js index 64f0ea88317..7be1d220c35 100644 --- a/src/scales/scale.radialLinear.js +++ b/src/scales/scale.radialLinear.js @@ -635,5 +635,5 @@ RadialLinearScale.defaultRoutes = { RadialLinearScale.descriptors = { angleLines: { _fallback: 'grid' - }, + } }; From 1afcae2b0e1fc7c18d36119ad824afa3f79415ed Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Sun, 30 May 2021 16:50:42 -0400 Subject: [PATCH 3/3] Update _scriptable for callback --- src/core/core.scale.defaults.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/core.scale.defaults.js b/src/core/core.scale.defaults.js index 90498f43816..c067b3e5cae 100644 --- a/src/core/core.scale.defaults.js +++ b/src/core/core.scale.defaults.js @@ -94,6 +94,6 @@ defaults.describe('scales', { }); defaults.describe('scale.ticks', { - _scriptable: (name) => name !== 'backdropPadding', + _scriptable: (name) => name !== 'backdropPadding' && name !== 'callback', _indexable: (name) => name !== 'backdropPadding', });