Refactoring using helpers.options.resolve (#5965)

This commit is contained in:
Akihiko Kusanagi
2019-01-08 23:50:33 +08:00
committed by Simon Brunel
parent dd3564aee5
commit 820debf452
18 changed files with 166 additions and 163 deletions

View File

@@ -6,6 +6,7 @@ var helpers = require('../helpers/index');
var layouts = require('../core/core.layouts');
var noop = helpers.noop;
var valueOrDefault = helpers.valueOrDefault;
defaults._set('global', {
legend: {
@@ -327,7 +328,6 @@ var Legend = Element.extend({
if (opts.display) {
var ctx = me.ctx;
var valueOrDefault = helpers.valueOrDefault;
var fontColor = valueOrDefault(labelOpts.fontColor, globalDefaults.defaultFontColor);
var labelFont = helpers.options._parseFont(labelOpts);
var fontSize = labelFont.size;

View File

@@ -141,7 +141,6 @@ var Title = Element.extend({
draw: function() {
var me = this;
var ctx = me.ctx;
var valueOrDefault = helpers.valueOrDefault;
var opts = me.options;
if (opts.display) {
@@ -155,7 +154,7 @@ var Title = Element.extend({
var right = me.right;
var maxWidth, titleX, titleY;
ctx.fillStyle = valueOrDefault(opts.fontColor, defaults.global.defaultFontColor); // render in correct colour
ctx.fillStyle = helpers.valueOrDefault(opts.fontColor, defaults.global.defaultFontColor); // render in correct colour
ctx.font = fontOpts.string;
// Horizontal