From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sun, 1 Mar 2020 14:57:39 +0000 (-0800) Subject: Alphabetize element default options (#7170) X-Git-Tag: v3.0.0-alpha~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=788dbd4499f71063357b2dbc2ba29a4e1f5282c6;p=thirdparty%2FChart.js.git Alphabetize element default options (#7170) * Alphabetize element default options * Add arc * Add missing comma --- diff --git a/src/elements/element.arc.js b/src/elements/element.arc.js index 88afb7757..bd0435390 100644 --- a/src/elements/element.arc.js +++ b/src/elements/element.arc.js @@ -6,9 +6,9 @@ const TAU = Math.PI * 2; defaults.set('elements', { arc: { backgroundColor: defaults.color, + borderAlign: 'center', borderColor: '#fff', - borderWidth: 2, - borderAlign: 'center' + borderWidth: 2 } }); diff --git a/src/elements/element.line.js b/src/elements/element.line.js index eacb96fbb..4a479e5ab 100644 --- a/src/elements/element.line.js +++ b/src/elements/element.line.js @@ -13,16 +13,16 @@ const defaultColor = defaults.color; defaults.set('elements', { line: { - tension: 0.4, backgroundColor: defaultColor, - borderWidth: 3, - borderColor: defaultColor, borderCapStyle: 'butt', + borderColor: defaultColor, borderDash: [], - borderDashOffset: 0.0, + borderDashOffset: 0, borderJoinStyle: 'miter', + borderWidth: 3, capBezierPoints: true, - fill: true + fill: true, + tension: 0.4 } }); diff --git a/src/elements/element.point.js b/src/elements/element.point.js index 8ca3bcbc0..c26c1cb3f 100644 --- a/src/elements/element.point.js +++ b/src/elements/element.point.js @@ -6,15 +6,14 @@ const defaultColor = defaults.color; defaults.set('elements', { point: { - radius: 3, - pointStyle: 'circle', backgroundColor: defaultColor, borderColor: defaultColor, borderWidth: 1, - // Hover hitRadius: 1, + hoverBorderWidth: 1, hoverRadius: 4, - hoverBorderWidth: 1 + pointStyle: 'circle', + radius: 3 } });