chartjs · etimberg · Feb 6, 2021 · Feb 6, 2021 · Feb 6, 2021
diff --git a/docs/docs/axes/radial/linear.mdx b/docs/docs/axes/radial/linear.mdx
@@ -65,9 +65,11 @@ let chart = new Chart(ctx, {
         labels: ['January', 'February', 'March', 'April']
     },
     options: {
-        scale: {
-            suggestedMin: 50,
-            suggestedMax: 100
+        scales: {
+            r: {
+                suggestedMin: 50,
+                suggestedMax: 100
+            }
         }
     }
 });
@@ -83,11 +85,13 @@ This example sets up a chart with a y axis that creates ticks at `0, 0.5, 1, 1.5
 
 ```javascript
 let options = {
-    scale: {
-        max: 5,
-        min: 0,
-        ticks: {
-            stepSize: 0.5
+    scales: {
+        r: {
+            max: 5,
+            min: 0,
+            ticks: {
+                stepSize: 0.5
+            }
         }
     }
 };

diff --git a/docs/docs/charts/radar.mdx b/docs/docs/charts/radar.mdx
@@ -178,12 +178,14 @@ The options for this scale are defined in the `scale` property, which can be ref
 
 ```javascript
 options = {
-    scale: {
-        angleLines: {
-            display: false
-        },
-        suggestedMin: 50,
-        suggestedMax: 100
+    scales: {
+        r: {
+            angleLines: {
+                display: false
+            },
+            suggestedMin: 50,
+            suggestedMax: 100
+        }
     }
 };
 ```

diff --git a/docs/docs/getting-started/v3-migration.md b/docs/docs/getting-started/v3-migration.md
@@ -73,6 +73,7 @@ A number of changes were made to the configuration options passed to the `Chart`
 * Polar area `startAngle` option is now consistent with `Radar`, 0 is at top and value is in degrees. Default is changed from `-½π` to  `0`.
 * Doughnut `rotation` option is now in degrees and 0 is at top. Default is changed from `-½π` to  `0`.
 * Doughnut `circumference` option is now in degrees. Default is changed from `2π` to `360`.
+* `scale` option was removed in favor of `options.scales.r` (or any other scale id, with `axis: 'r'`)
 * `scales.[x/y]Axes` arrays were removed. Scales are now configured directly to `options.scales` object with the object key being the scale Id.
 * `scales.[x/y]Axes.barPercentage` was moved to dataset option `barPercentage`
 * `scales.[x/y]Axes.barThickness` was moved to dataset option `barThickness`

diff --git a/samples/charts/polar-area.html b/samples/charts/polar-area.html
@@ -67,11 +67,13 @@
 						text: 'Chart.js Polar Area Chart'
 					},
 				},
-				scale: {
-					ticks: {
-						beginAtZero: true
-					},
-					reverse: false
+				scales: {
+					r: {
+						ticks: {
+							beginAtZero: true
+						},
+						reverse: false
+					}
 				},
 				animation: {
 					animateRotate: false,

diff --git a/samples/charts/radar-skip-points.html b/samples/charts/radar-skip-points.html
@@ -85,8 +85,10 @@
 						tension: 0.0,
 					}
 				},
-				scale: {
-					beginAtZero: true,
+				scales: {
+					r: {
+						beginAtZero: true,
+					},
 				}
 			}
 		};

diff --git a/samples/charts/radar.html b/samples/charts/radar.html
@@ -73,8 +73,10 @@
 						text: 'Chart.js Radar Chart'
 					},
 				},
-				scale: {
-					beginAtZero: true
+				scales: {
+					r: {
+						beginAtZero: true
+					}
 				}
 			}
 		};

diff --git a/src/core/core.config.js b/src/core/core.config.js
@@ -56,12 +56,6 @@ function mergeScaleConfig(config, options) {
 		scales[id] = mergeIf(Object.create(null), [{axis}, scaleConf, defaultScaleOptions[axis], defaultScaleOptions[defaultId]]);
 	});
 
-	// Backward compatibility
-	if (options.scale) {
-		scales[options.scale.id || 'r'] = mergeIf(Object.create(null), [{axis: 'r'}, options.scale, chartDefaults.scales.r]);
-		firstIDs.r = firstIDs.r || options.scale.id || 'r';
-	}
-
 	// Then merge dataset defaults to scale configs
 	config.data.datasets.forEach(dataset => {
 		const type = dataset.type || config.type;

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
@@ -305,13 +305,6 @@ class Chart {
 			}
 
 			scale.init(scaleOptions, options);
-
-			// TODO(SB): I think we should be able to remove this custom case (options.scale)
-			// and consider it as a regular scale part of the "scales"" map only! This would
-			// make the logic easier and remove some useless? custom code.
-			if (item.isDefault) {
-				me.scale = scale;
-			}
 		});
 		// clear up discarded scales
 		each(updated, (hasUpdated, id) => {

diff --git a/test/fixtures/controller.polarArea/angle-array.json b/test/fixtures/controller.polarArea/angle-array.json
@@ -1,32 +1,34 @@
 {
-    "config": {
-        "type": "polarArea",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"],
-            "datasets": [{
-                "data": [11, 16, 21, 7, 10],
-                "backgroundColor": [
-                    "rgba(255, 99, 132, 0.8)",
-                    "rgba(54, 162, 235, 0.8)",
-                    "rgba(255, 206, 86, 0.8)",
-                    "rgba(75, 192, 192, 0.8)",
-                    "rgba(153, 102, 255, 0.8)",
-                    "rgba(255, 159, 64, 0.8)"
-                ]
-            }]
-        },
-        "options": {
-            "elements": {
-                "arc": {
-                    "angle": [
-                        60.5387, 100.6457, 60.5387, 123.5641, 14.7021
-                    ]
-                }
-            },
-            "responsive": false,
-            "scale": {
-                "display": false
-            }
+  "config": {
+    "type": "polarArea",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"],
+      "datasets": [
+        {
+          "data": [11, 16, 21, 7, 10],
+          "backgroundColor": [
+            "rgba(255, 99, 132, 0.8)",
+            "rgba(54, 162, 235, 0.8)",
+            "rgba(255, 206, 86, 0.8)",
+            "rgba(75, 192, 192, 0.8)",
+            "rgba(153, 102, 255, 0.8)",
+            "rgba(255, 159, 64, 0.8)"
+          ]
         }
+      ]
+    },
+    "options": {
+      "elements": {
+        "arc": {
+          "angle": [60.5387, 100.6457, 60.5387, 123.5641, 14.7021]
+        }
+      },
+      "responsive": false,
+      "scales": {
+        "r": {
+          "display": false
+        }
+      }
     }
+  }
 }
diff --git a/test/fixtures/controller.polarArea/angle-lines.json b/test/fixtures/controller.polarArea/angle-lines.json
@@ -1,33 +1,37 @@
 {
-	"threshold": 0.05,
-    "config": {
-        "type": "polarArea",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"],
-            "datasets": [{
-                "data": [11, 16, 21, 7, 10],
-                "backgroundColor": [
-                    "rgba(255, 99, 132, 0.8)",
-                    "rgba(54, 162, 235, 0.8)",
-                    "rgba(255, 206, 86, 0.8)",
-                    "rgba(75, 192, 192, 0.8)",
-                    "rgba(153, 102, 255, 0.8)",
-                    "rgba(255, 159, 64, 0.8)"
-                ]
-            }]
-		},
-        "options": {
-            "responsive": false,
-            "scale": {
-				"display": true,
-				"angleLines": {
-					"display": true,
-					"color": "#000"
-				},
-				"ticks": {
-					"display": false
-				}
-            }
+  "threshold": 0.05,
+  "config": {
+    "type": "polarArea",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"],
+      "datasets": [
+        {
+          "data": [11, 16, 21, 7, 10],
+          "backgroundColor": [
+            "rgba(255, 99, 132, 0.8)",
+            "rgba(54, 162, 235, 0.8)",
+            "rgba(255, 206, 86, 0.8)",
+            "rgba(75, 192, 192, 0.8)",
+            "rgba(153, 102, 255, 0.8)",
+            "rgba(255, 159, 64, 0.8)"
+          ]
         }
+      ]
+    },
+    "options": {
+      "responsive": false,
+      "scales": {
+        "r": {
+          "display": true,
+          "angleLines": {
+            "display": true,
+            "color": "#000"
+          },
+          "ticks": {
+            "display": false
+          }
+        }
+      }
     }
+  }
 }
diff --git a/test/fixtures/controller.polarArea/angle-undefined.json b/test/fixtures/controller.polarArea/angle-undefined.json
@@ -1,25 +1,29 @@
 {
-    "config": {
-        "type": "polarArea",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"],
-            "datasets": [{
-                "data": [11, 16, 21, 7, 10],
-                "backgroundColor": [
-                    "rgba(255, 99, 132, 0.8)",
-                    "rgba(54, 162, 235, 0.8)",
-                    "rgba(255, 206, 86, 0.8)",
-                    "rgba(75, 192, 192, 0.8)",
-                    "rgba(153, 102, 255, 0.8)",
-                    "rgba(255, 159, 64, 0.8)"
-                ]
-            }]
-        },
-        "options": {
-            "responsive": false,
-            "scale": {
-                "display": false
-            }
+  "config": {
+    "type": "polarArea",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"],
+      "datasets": [
+        {
+          "data": [11, 16, 21, 7, 10],
+          "backgroundColor": [
+            "rgba(255, 99, 132, 0.8)",
+            "rgba(54, 162, 235, 0.8)",
+            "rgba(255, 206, 86, 0.8)",
+            "rgba(75, 192, 192, 0.8)",
+            "rgba(153, 102, 255, 0.8)",
+            "rgba(255, 159, 64, 0.8)"
+          ]
         }
+      ]
+    },
+    "options": {
+      "responsive": false,
+      "scales": {
+        "r": {
+          "display": false
+        }
+      }
     }
+  }
 }
diff --git a/test/fixtures/controller.polarArea/backgroundColor/indexable-dataset.js b/test/fixtures/controller.polarArea/backgroundColor/indexable-dataset.js
@@ -19,8 +19,10 @@ module.exports = {
 			]
 		},
 		options: {
-			scale: {
-				display: false
+			scales: {
+				r: {
+					display: false
+				}
 			}
 		}
 	},

diff --git a/test/fixtures/controller.polarArea/backgroundColor/indexable-element-options.js b/test/fixtures/controller.polarArea/backgroundColor/indexable-element-options.js
@@ -23,8 +23,10 @@ module.exports = {
 					]
 				}
 			},
-			scale: {
-				display: false
+			scales: {
+				r: {
+					display: false
+				}
 			}
 		}
 	},

diff --git a/test/fixtures/controller.polarArea/backgroundColor/scriptable-dataset.js b/test/fixtures/controller.polarArea/backgroundColor/scriptable-dataset.js
@@ -18,8 +18,10 @@ module.exports = {
 			]
 		},
 		options: {
-			scale: {
-				display: false
+			scales: {
+				r: {
+					display: false
+				}
 			}
 		}
 	},

diff --git a/test/fixtures/controller.polarArea/backgroundColor/scriptable-element-options.js b/test/fixtures/controller.polarArea/backgroundColor/scriptable-element-options.js
@@ -22,8 +22,10 @@ module.exports = {
 					}
 				}
 			},
-			scale: {
-				display: false
+			scales: {
+				r: {
+					display: false
+				}
 			}
 		}
 	},

diff --git a/test/fixtures/controller.polarArea/backgroundColor/value-dataset.js b/test/fixtures/controller.polarArea/backgroundColor/value-dataset.js
@@ -12,8 +12,10 @@ module.exports = {
 			]
 		},
 		options: {
-			scale: {
-				display: false
+			scales: {
+				r: {
+					display: false
+				}
 			}
 		}
 	},

diff --git a/test/fixtures/controller.polarArea/backgroundColor/value-element-options.js b/test/fixtures/controller.polarArea/backgroundColor/value-element-options.js
@@ -16,8 +16,10 @@ module.exports = {
 					backgroundColor: '#00ff00'
 				}
 			},
-			scale: {
-				display: false
+			scales: {
+				r: {
+					display: false
+				}
 			}
 		}
 	},