From 82d5d35b3e28ca5c59af8c46278d237f1d924286 Mon Sep 17 00:00:00 2001 From: flaurida Date: Tue, 6 Feb 2018 09:28:39 -0500 Subject: [PATCH 1/2] Support multiple font colors in array --- docs/axes/radial/linear.md | 2 +- src/scales/scale.radialLinear.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/axes/radial/linear.md b/docs/axes/radial/linear.md index adebe77cc61..14009be6a5c 100644 --- a/docs/axes/radial/linear.md +++ b/docs/axes/radial/linear.md @@ -104,7 +104,7 @@ The following options are used to configure the point labels that are shown on t | Name | Type | Default | Description | -----| ---- | --------| ----------- | `callback` | `Function` | | Callback function to transform data labels to point labels. The default implementation simply returns the current string. -| `fontColor` | `Color` | `'#666'` | Font color for point labels. +| `fontColor` | `Color/Color[]` | `'#666'` | Font color for point labels. | `fontFamily` | `String` | `"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"` | Font family to use when rendering labels. | `fontSize` | `Number` | 10 | font size in pixels | `fontStyle` | `String` | `'normal'` | Font style to use when rendering point labels. diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js index 9f59f17887a..71823b383ef 100644 --- a/src/scales/scale.radialLinear.js +++ b/src/scales/scale.radialLinear.js @@ -267,7 +267,7 @@ module.exports = function(Chart) { var pointLabelPosition = scale.getPointPosition(i, outerDistance + 5); // Keep this in loop since we may support array properties here - var pointLabelFontColor = valueOrDefault(pointLabelOpts.fontColor, globalDefaults.defaultFontColor); + var pointLabelFontColor = helpers.valueAtIndexOrDefault(pointLabelOpts.fontColor, i, globalDefaults.defaultFontColor); ctx.font = plFont.font; ctx.fillStyle = pointLabelFontColor; From 4bd431637ad7d728e8bdc49ac9678ab522eb5afe Mon Sep 17 00:00:00 2001 From: flaurida Date: Tue, 6 Feb 2018 10:21:37 -0500 Subject: [PATCH 2/2] Address linting error --- src/scales/scale.radialLinear.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js index 71823b383ef..e36b4e13539 100644 --- a/src/scales/scale.radialLinear.js +++ b/src/scales/scale.radialLinear.js @@ -237,7 +237,6 @@ module.exports = function(Chart) { function drawPointLabels(scale) { var ctx = scale.ctx; - var valueOrDefault = helpers.valueOrDefault; var opts = scale.options; var angleLineOpts = opts.angleLines; var pointLabelOpts = opts.pointLabels;