From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sat, 22 Feb 2020 19:33:39 +0000 (-0500)
Subject: Ensure all samples use correct scale options (#7147)
X-Git-Tag: v3.0.0-alpha~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa174551c4d2d936fb8b8972a2ce63a4266adc0a;p=thirdparty%2FChart.js.git

Ensure all samples use correct scale options (#7147)
---

diff --git a/samples/advanced/line-gradient.html b/samples/advanced/line-gradient.html
index b60a17a27..bbbd08259 100644
--- a/samples/advanced/line-gradient.html
+++ b/samples/advanced/line-gradient.html
@@ -82,20 +82,20 @@
 					intersect: true
 				},
 				scales: {
-					xAxes: [{
+					x: {
 						display: true,
 						scaleLabel: {
 							display: true,
 							labelString: 'Month'
 						}
-					}],
-					yAxes: [{
+					},
+					y: {
 						display: true,
 						scaleLabel: {
 							display: true,
 							labelString: 'Value'
 						}
-					}]
+					}
 				}
 			}
 		};
diff --git a/samples/scales/axes-labels.html b/samples/scales/axes-labels.html
index da9c76e62..66bad81b2 100644
--- a/samples/scales/axes-labels.html
+++ b/samples/scales/axes-labels.html
@@ -76,7 +76,7 @@
 					intersect: true
 				},
 				scales: {
-					xAxes: [{
+					x: {
 						display: true,
 						scaleLabel: {
 							display: true,
@@ -88,8 +88,8 @@
 							fontStyle: 'bold',
 							padding: {top: 20, left: 0, right: 0, bottom: 0}
 						}
-					}],
-					yAxes: [{
+					},
+					y: {
 						display: true,
 						scaleLabel: {
 							display: true,
@@ -101,7 +101,7 @@
 							fontStyle: 'normal',
 							padding: {top: 30, left: 0, right: 0, bottom: 0}
 						}
-					}]
+					}
 				}
 			}
 		};
diff --git a/samples/scales/gridlines-scriptable.html b/samples/scales/gridlines-scriptable.html
index 447114920..306467f84 100644
--- a/samples/scales/gridlines-scriptable.html
+++ b/samples/scales/gridlines-scriptable.html
@@ -44,7 +44,7 @@
 					text: 'Grid Line Settings'
 				},
 				scales: {
-					yAxes: [{
+					y: {
 						gridLines: {
 							drawBorder: false,
 							color: function(context) {
@@ -57,7 +57,7 @@
 								return '#000000';
 							},
 						},
-					}]
+					}
 				}
 			}
 		};