Remove options.scale, in favor of options.scales.r (#8393)

Remove options.scale, in favor of options.scales.r

diff --git a/docs/docs/axes/radial/linear.mdx b/docs/docs/axes/radial/linear.mdx
index 10cf1757b11cc472a79a3f614d5bedc9bd4fc176..fe3e992101f735ba1c5208824a8e9b296f0f621c 100644 (file)
--- 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
index 0c2a377e05eb66f595c82d443bf66399103c94cb..06fe80fd378fdcbce29ecb819bdde9b646741f37 100644 (file)
--- 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
index bce18903c1f25bbe614afed231ad75f1c2478a4c..6b86132ecf2abffa138e0b77f5364748b7881cb8 100644 (file)
--- 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
index 38b43a07129ecdb2d82a1f53bf3ac0dd2c9c44a6..b5d70660db08eb8507c9175631f134d631696b0c 100644 (file)
--- 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
index 45fa896d86fdd592ee376c149da6942feb2b88c0..320c380115f20a17c0d4857e9c8adcfb55ff39cc 100644 (file)
--- 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
index 9f225bee94b7fb07cdc8824c63c3fc7acf19280a..f24338a7f6e527918676f3f2e1fe102cb58446f1 100644 (file)
--- 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
index ce32047e02be02094fa78b48c33c67ef30cac599..6772182ff0f966a3397f06e1d3b789e7f1b7b23d 100644 (file)
--- 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
index 9fae07125d6eefaf41438a2aaeb36e3f212483fa..8d257f9c3182753c08c2425e795629a3646403da 100644 (file)
--- 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
index 151b04b3393dad27f52981dcec605d1cd867bc8d..a1f835a38ea6a13379a3561e5c88ec8e91f7c0e5 100644 (file)
--- 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
index b7c05d5493beb80ad81ef1cda8cf0908309b884e..55d8a42a270d9b7be6d58ce273f888872ad30eb6 100644 (file)
--- 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
index e1758b4b74623299dc04587267ecbb3c40341193..b2fc1a736136a30adfaf0032c1786f504b94a564 100644 (file)
--- 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
index 60e635cddfa56c46e521fea57cd2ad56da682816..ab4f654fe3751f260f427ffaf50ccf78b26fb082 100644 (file)
--- 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
index 371f2b60671a7356dac525a13f97c20a5f9f425e..813d18274f2dc9313f7fdbffb637a1d16fddc5f9 100644 (file)
--- 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
index 22f2b0e802cf763e8e8b9f75004271590940af5a..e3754faf45f6dc429fac199a38ef6f3b46e29045 100644 (file)
--- 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
index 97fb913170557a727f068a7355063db2554dca3f..dd9651c4c6fc8d92b74b5f853786f588820ac317 100644 (file)
--- 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
index 7a17ee754a9ef83dd462df36f3f42d7c53a2f4e1..5fe96ce475eaf6d0f28eae3681014934c2adeae5 100644 (file)
--- 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
index 8c0dc9423fad0c50071abbb3e3ec389c30a793ea..1b6fef8e62ec19cb994562d0ebdd04031912c2ff 100644 (file)
--- 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
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/border-align-center.json b/test/fixtures/controller.polarArea/border-align-center.json
index 683cc9fb02d8ba812c170bbce1e857f534d1abd8..c3ecf87ee21cdd087b102a69349bad7b8f524cfd 100644 (file)
--- a/test/fixtures/controller.polarArea/border-align-center.json
+++ b/test/fixtures/controller.polarArea/border-align-center.json
@@ -1,39 +1,41 @@
 {
-    "config": {
-        "type": "polarArea",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"],
-            "datasets": [{
-                "data": [11, 16, 21, 1, 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)"
-                ],
-                "borderWidth": 20,
-                "borderColor": [
-                    "rgb(255, 99, 132)",
-                    "rgb(54, 162, 235)",
-                    "rgb(255, 206, 86)",
-                    "rgb(75, 192, 192)",
-                    "rgb(153, 102, 255)"
-                ]
-            }]
-        },
-        "options": {
-            "elements": {
-                "arc": {
-                    "angle": [
-                        2.1658, 10.8404, 21.6922, 108.4323, 216.8588
-                    ]
-                }
-            },
-            "responsive": false,
-            "scale": {
-                "display": false
-            }
+  "config": {
+    "type": "polarArea",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"],
+      "datasets": [
+        {
+          "data": [11, 16, 21, 1, 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)"
+          ],
+          "borderWidth": 20,
+          "borderColor": [
+            "rgb(255, 99, 132)",
+            "rgb(54, 162, 235)",
+            "rgb(255, 206, 86)",
+            "rgb(75, 192, 192)",
+            "rgb(153, 102, 255)"
+          ]
         }
+      ]
+    },
+    "options": {
+      "elements": {
+        "arc": {
+          "angle": [2.1658, 10.8404, 21.6922, 108.4323, 216.8588]
+        }
+      },
+      "responsive": false,
+      "scales": {
+        "r": {
+          "display": false
+        }
+      }
     }
+  }
 }

diff --git a/test/fixtures/controller.polarArea/border-align-inner.json b/test/fixtures/controller.polarArea/border-align-inner.json
index 6ed5753aab7abaa2b32505be4dd930dcd1fbcd91..d709b0f8babed9abf6e0f9cc8ab024a588cdc58e 100644 (file)
--- a/test/fixtures/controller.polarArea/border-align-inner.json
+++ b/test/fixtures/controller.polarArea/border-align-inner.json
@@ -1,40 +1,42 @@
 {
-    "config": {
-        "type": "polarArea",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"],
-            "datasets": [{
-                "data": [11, 16, 21, 1, 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)"
-                ],
-                "borderWidth": 20,
-                "borderColor": [
-                    "rgb(255, 99, 132)",
-                    "rgb(54, 162, 235)",
-                    "rgb(255, 206, 86)",
-                    "rgb(75, 192, 192)",
-                    "rgb(153, 102, 255)"
-                ],
-                "borderAlign": "inner"
-            }]
-        },
-        "options": {
-            "elements": {
-                "arc": {
-                    "angle": [
-                        2.1658, 10.8404, 21.6922, 108.4323, 216.8588
-                    ]
-                }
-            },
-            "responsive": false,
-            "scale": {
-                "display": false
-            }
+  "config": {
+    "type": "polarArea",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"],
+      "datasets": [
+        {
+          "data": [11, 16, 21, 1, 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)"
+          ],
+          "borderWidth": 20,
+          "borderColor": [
+            "rgb(255, 99, 132)",
+            "rgb(54, 162, 235)",
+            "rgb(255, 206, 86)",
+            "rgb(75, 192, 192)",
+            "rgb(153, 102, 255)"
+          ],
+          "borderAlign": "inner"
         }
+      ]
+    },
+    "options": {
+      "elements": {
+        "arc": {
+          "angle": [2.1658, 10.8404, 21.6922, 108.4323, 216.8588]
+        }
+      },
+      "responsive": false,
+      "scales": {
+        "r": {
+          "display": false
+        }
+      }
     }
+  }
 }

diff --git a/test/fixtures/controller.polarArea/borderAlign/indexable-dataset.js b/test/fixtures/controller.polarArea/borderAlign/indexable-dataset.js
index 67a8005ea91c0ccc5ba162d43bdf99f4466769bf..5f121da5bd5bd34ab91db7aebeac50dc58788bd3 100644 (file)
--- a/test/fixtures/controller.polarArea/borderAlign/indexable-dataset.js
+++ b/test/fixtures/controller.polarArea/borderAlign/indexable-dataset.js
@@ -27,8 +27,10 @@ module.exports = {
                                        borderWidth: 5,
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderAlign/indexable-element-options.js b/test/fixtures/controller.polarArea/borderAlign/indexable-element-options.js
index 77f417d234089fbb19984f50d03bf695acf2212f..8a3cc5c94e8c54383a55358ba6511604abf04ac1 100644 (file)
--- a/test/fixtures/controller.polarArea/borderAlign/indexable-element-options.js
+++ b/test/fixtures/controller.polarArea/borderAlign/indexable-element-options.js
@@ -26,8 +26,10 @@ module.exports = {
                                        ]
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderAlign/scriptable-dataset.js b/test/fixtures/controller.polarArea/borderAlign/scriptable-dataset.js
index b84e3eed9919d71c6a602a9fd1fc4980442f40a8..d86b4a924b08530f7e6edc422cdb3d3358349e39 100644 (file)
--- a/test/fixtures/controller.polarArea/borderAlign/scriptable-dataset.js
+++ b/test/fixtures/controller.polarArea/borderAlign/scriptable-dataset.js
@@ -23,8 +23,10 @@ module.exports = {
                                        borderWidth: 8,
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderAlign/scriptable-element-options.js b/test/fixtures/controller.polarArea/borderAlign/scriptable-element-options.js
index 0008cd9549dab4f0b75762d1725a4c2a55ffcde0..1cc9f41cea54f8d6133e03ba6c1c2ac02b240e30 100644 (file)
--- a/test/fixtures/controller.polarArea/borderAlign/scriptable-element-options.js
+++ b/test/fixtures/controller.polarArea/borderAlign/scriptable-element-options.js
@@ -22,8 +22,10 @@ module.exports = {
                                        }
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderAlign/value-dataset.js b/test/fixtures/controller.polarArea/borderAlign/value-dataset.js
index 6c2c5de4bac0ef86103ce7aa83bf05b78f75dd88..08c1a27b1a3d92262952fe4332fd97dd598b7c6b 100644 (file)
--- a/test/fixtures/controller.polarArea/borderAlign/value-dataset.js
+++ b/test/fixtures/controller.polarArea/borderAlign/value-dataset.js
@@ -20,8 +20,10 @@ module.exports = {
                                        borderWidth: 4,
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderAlign/value-element-options.js b/test/fixtures/controller.polarArea/borderAlign/value-element-options.js
index 29beb10273b121fbd6167807808d883ef3e6e29d..fff5d37e42ae7c5c439bf2adc9e5be903467e329 100644 (file)
--- a/test/fixtures/controller.polarArea/borderAlign/value-element-options.js
+++ b/test/fixtures/controller.polarArea/borderAlign/value-element-options.js
@@ -19,8 +19,10 @@ module.exports = {
                                        borderWidth: 4,
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderColor/indexable-dataset.js b/test/fixtures/controller.polarArea/borderColor/indexable-dataset.js
index 655afa8d0bdf90100cb1055106bce65fe65b0b96..a9b8a49eed7e321412ea950907cc4770e862e22d 100644 (file)
--- a/test/fixtures/controller.polarArea/borderColor/indexable-dataset.js
+++ b/test/fixtures/controller.polarArea/borderColor/indexable-dataset.js
@@ -25,8 +25,10 @@ module.exports = {
                                        borderWidth: 8
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderColor/indexable-element-options.js b/test/fixtures/controller.polarArea/borderColor/indexable-element-options.js
index 982a72d29d29f0c97402fd3f220247cff278a32b..6a02f6b4d24b1b8b6995aa1a1f52a397debf4bd7 100644 (file)
--- a/test/fixtures/controller.polarArea/borderColor/indexable-element-options.js
+++ b/test/fixtures/controller.polarArea/borderColor/indexable-element-options.js
@@ -25,8 +25,10 @@ module.exports = {
                                        borderWidth: 8
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderColor/scriptable-dataset.js b/test/fixtures/controller.polarArea/borderColor/scriptable-dataset.js
index 4af1e488be7f648c6202e59128b1515e9198d2a2..e5639434643da3e8a2d94ff8ba5bbaea4e5d9aed 100644 (file)
--- a/test/fixtures/controller.polarArea/borderColor/scriptable-dataset.js
+++ b/test/fixtures/controller.polarArea/borderColor/scriptable-dataset.js
@@ -24,8 +24,10 @@ module.exports = {
                                        borderWidth: 8
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderColor/scriptable-element-options.js b/test/fixtures/controller.polarArea/borderColor/scriptable-element-options.js
index 58f14739c6c7cfe807e76cc575107ded4d77a755..733b21933ba0eb0c3ebb9fa7de389b2652478a4c 100644 (file)
--- a/test/fixtures/controller.polarArea/borderColor/scriptable-element-options.js
+++ b/test/fixtures/controller.polarArea/borderColor/scriptable-element-options.js
@@ -24,8 +24,10 @@ module.exports = {
                                        borderWidth: 8
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderColor/value-dataset.js b/test/fixtures/controller.polarArea/borderColor/value-dataset.js
index d266635e359649684c5bc5c9c8b6534b76eaac02..925eddf2e7aae8f5c5fefdfd3fe22209bb999b75 100644 (file)
--- a/test/fixtures/controller.polarArea/borderColor/value-dataset.js
+++ b/test/fixtures/controller.polarArea/borderColor/value-dataset.js
@@ -18,8 +18,10 @@ module.exports = {
                                        borderWidth: 8
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderColor/value-element-options.js b/test/fixtures/controller.polarArea/borderColor/value-element-options.js
index 45e8693f4339a6e2caff977cfd9772edb9b1a3ff..b75ea24311fca215e11d8dadb407c1965ba73dbd 100644 (file)
--- a/test/fixtures/controller.polarArea/borderColor/value-element-options.js
+++ b/test/fixtures/controller.polarArea/borderColor/value-element-options.js
@@ -18,8 +18,10 @@ module.exports = {
                                        borderWidth: 8
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderWidth/indexable-dataset.js b/test/fixtures/controller.polarArea/borderWidth/indexable-dataset.js
index c03f64c24c93dc0289fa8676eebb49952dc2365f..901612e1bc624b4c840ffd1007dd8dd468f7ff00 100644 (file)
--- a/test/fixtures/controller.polarArea/borderWidth/indexable-dataset.js
+++ b/test/fixtures/controller.polarArea/borderWidth/indexable-dataset.js
@@ -25,8 +25,10 @@ module.exports = {
                                        borderColor: '#888',
                                }
                        },
-                       scale: {
-                               display: false,
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderWidth/indexable-element-options.js b/test/fixtures/controller.polarArea/borderWidth/indexable-element-options.js
index 2b7d144128a880c2bbdd835ba886a80d1cdb575c..8b75cc985bf1c3365c2a1d5ccd0aafd2f30a923d 100644 (file)
--- a/test/fixtures/controller.polarArea/borderWidth/indexable-element-options.js
+++ b/test/fixtures/controller.polarArea/borderWidth/indexable-element-options.js
@@ -25,8 +25,10 @@ module.exports = {
                                        ]
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderWidth/scriptable-dataset.js b/test/fixtures/controller.polarArea/borderWidth/scriptable-dataset.js
index 36e91a7fd23d7e5467c34aeea15cf8feead94b1c..bdd4b4e320419a6270e87947ee70152e22f6a2da 100644 (file)
--- a/test/fixtures/controller.polarArea/borderWidth/scriptable-dataset.js
+++ b/test/fixtures/controller.polarArea/borderWidth/scriptable-dataset.js
@@ -21,8 +21,10 @@ module.exports = {
                                        borderColor: '#888',
                                }
                        },
-                       scale: {
-                               display: false,
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderWidth/scriptable-element-options.js b/test/fixtures/controller.polarArea/borderWidth/scriptable-element-options.js
index dca17e685e410c503a665ce8d83721abb21139dc..f57915eb827c68768191f68cb105d044ed2e7915 100644 (file)
--- a/test/fixtures/controller.polarArea/borderWidth/scriptable-element-options.js
+++ b/test/fixtures/controller.polarArea/borderWidth/scriptable-element-options.js
@@ -20,8 +20,10 @@ module.exports = {
                                        }
                                }
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderWidth/value-dataset.js b/test/fixtures/controller.polarArea/borderWidth/value-dataset.js
index 2fc8e1b250b094993094bc938369cff5642e6dbd..0981b4e2beead8b1ff458a03fca48d7420ee6c89 100644 (file)
--- a/test/fixtures/controller.polarArea/borderWidth/value-dataset.js
+++ b/test/fixtures/controller.polarArea/borderWidth/value-dataset.js
@@ -18,8 +18,10 @@ module.exports = {
                                        borderColor: '#888',
                                }
                        },
-                       scale: {
-                               display: false,
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.polarArea/borderWidth/value-element-options.js b/test/fixtures/controller.polarArea/borderWidth/value-element-options.js
index bdafaca68e7106a7988e1b5318c64f3165e61064..42d2a86be51bc67d772a90b97b1f2e50b0b31892 100644 (file)
--- a/test/fixtures/controller.polarArea/borderWidth/value-element-options.js
+++ b/test/fixtures/controller.polarArea/borderWidth/value-element-options.js
@@ -18,8 +18,10 @@ module.exports = {
                                        borderWidth: 4
                                }
                        },
-                       scale: {
-                               display: false,
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/backgroundColor/scriptable.js b/test/fixtures/controller.radar/backgroundColor/scriptable.js
index 80953d7b99c6f6227693bc66eb1e13a53a8b64fd..54ccb5f1f2700d3b47ddfc1e3af5a70610b5cf15 100644 (file)
--- a/test/fixtures/controller.radar/backgroundColor/scriptable.js
+++ b/test/fixtures/controller.radar/backgroundColor/scriptable.js
@@ -36,9 +36,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15,
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15,
+                               },
                        },
                        plugins: {
                                legend: false,

diff --git a/test/fixtures/controller.radar/backgroundColor/value.js b/test/fixtures/controller.radar/backgroundColor/value.js
index 5c090a775405569dbe25c7861c1aaf1728a0eb8c..0c60841047dd7bc66475b1146d0147652fc2a364 100644 (file)
--- a/test/fixtures/controller.radar/backgroundColor/value.js
+++ b/test/fixtures/controller.radar/backgroundColor/value.js
@@ -25,9 +25,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        },
                        plugins: {
                                legend: false,

diff --git a/test/fixtures/controller.radar/borderCapStyle/scriptable.js b/test/fixtures/controller.radar/borderCapStyle/scriptable.js
index bbcf06daed822081bd4d665f9153ecfb10c41772..0bd84298bbd381e95a2656e3fefb9edae340705f 100644 (file)
--- a/test/fixtures/controller.radar/borderCapStyle/scriptable.js
+++ b/test/fixtures/controller.radar/borderCapStyle/scriptable.js
@@ -44,9 +44,11 @@ module.exports = {
                        layout: {
                                padding: 32
                        },
-                       scale: {
-                               display: false,
-                               beginAtZero: true
+                       scales: {
+                               r: {
+                                       display: false,
+                                       beginAtZero: true
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/borderCapStyle/value.js b/test/fixtures/controller.radar/borderCapStyle/value.js
index c730dfc861d826cb1d846652666cd519c7bf7f09..c5b914f9ec41ad91668acd4977bc2d37270c5072 100644 (file)
--- a/test/fixtures/controller.radar/borderCapStyle/value.js
+++ b/test/fixtures/controller.radar/borderCapStyle/value.js
@@ -35,9 +35,11 @@ module.exports = {
                        layout: {
                                padding: 32
                        },
-                       scale: {
-                               display: false,
-                               beginAtZero: true
+                       scales: {
+                               r: {
+                                       display: false,
+                                       beginAtZero: true
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/borderColor/scriptable.js b/test/fixtures/controller.radar/borderColor/scriptable.js
index 89bdf26eeca56e8058755a289dcc030f13193522..b301e2e9efec505f9a37f0873fcee137af07ec6f 100644 (file)
--- a/test/fixtures/controller.radar/borderColor/scriptable.js
+++ b/test/fixtures/controller.radar/borderColor/scriptable.js
@@ -38,9 +38,11 @@ module.exports = {
                                        radius: 16
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/borderColor/value.js b/test/fixtures/controller.radar/borderColor/value.js
index 9b9bacfc0fc257a50078ec762ac89736c23f59f1..ce40c1d4f7b28dc570bab61378ba608bb0d97a3b 100644 (file)
--- a/test/fixtures/controller.radar/borderColor/value.js
+++ b/test/fixtures/controller.radar/borderColor/value.js
@@ -26,9 +26,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/borderDash/scriptable.js b/test/fixtures/controller.radar/borderDash/scriptable.js
index 8a54bfb92343fcfc005217f11c00c5b44d1ca926..a26873c11369708b8fb787eb761274b39f4d26c8 100644 (file)
--- a/test/fixtures/controller.radar/borderDash/scriptable.js
+++ b/test/fixtures/controller.radar/borderDash/scriptable.js
@@ -30,9 +30,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/borderDash/value.js b/test/fixtures/controller.radar/borderDash/value.js
index f4a4596dfe463c9b35a6039bcfc8c63a04afed47..3d19af8983929afc12f7cb8cb682bb97fd98d683 100644 (file)
--- a/test/fixtures/controller.radar/borderDash/value.js
+++ b/test/fixtures/controller.radar/borderDash/value.js
@@ -27,10 +27,13 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
+
                }
        },
        options: {

diff --git a/test/fixtures/controller.radar/borderDashOffset/scriptable.js b/test/fixtures/controller.radar/borderDashOffset/scriptable.js
index 5262483fc1f72806ed3cb542d64a96a6ded2f52a..0aecff6d4091e54b91e55ee22aa1b61fb2ab46b0 100644 (file)
--- a/test/fixtures/controller.radar/borderDashOffset/scriptable.js
+++ b/test/fixtures/controller.radar/borderDashOffset/scriptable.js
@@ -36,10 +36,13 @@ module.exports = {
                        layout: {
                                padding: 32
                        },
-                       scale: {
-                               display: false,
-                               min: -1
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -1
+                               }
                        }
+
                }
        },
        options: {

diff --git a/test/fixtures/controller.radar/borderDashOffset/value.js b/test/fixtures/controller.radar/borderDashOffset/value.js
index 6c7ed68f2df8a90f9dbf297c852ffc1ef4737e2d..18d0bcc478335ee499bc1bfe750bcfc63a32f747 100644 (file)
--- a/test/fixtures/controller.radar/borderDashOffset/value.js
+++ b/test/fixtures/controller.radar/borderDashOffset/value.js
@@ -32,10 +32,13 @@ module.exports = {
                        layout: {
                                padding: 32
                        },
-                       scale: {
-                               display: false,
-                               min: -1
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -1
+                               }
                        }
+
                }
        },
        options: {

diff --git a/test/fixtures/controller.radar/borderJoinStyle/scriptable.js b/test/fixtures/controller.radar/borderJoinStyle/scriptable.js
index 5ff3fdd01ec46c42bf0946b9a54d3a8903f33425..d36a3a0503541ff831411a4c6a96a078f475ed61 100644 (file)
--- a/test/fixtures/controller.radar/borderJoinStyle/scriptable.js
+++ b/test/fixtures/controller.radar/borderJoinStyle/scriptable.js
@@ -44,9 +44,11 @@ module.exports = {
                        layout: {
                                padding: 32
                        },
-                       scale: {
-                               display: false,
-                               beginAtZero: true
+                       scales: {
+                               r: {
+                                       display: false,
+                                       beginAtZero: true
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/borderJoinStyle/value.js b/test/fixtures/controller.radar/borderJoinStyle/value.js
index ad6a0003309acbc406fd1c4ff4c400481108b123..fc05fb2515ad78f1919e4b4b479e6f3b4eb3a5b8 100644 (file)
--- a/test/fixtures/controller.radar/borderJoinStyle/value.js
+++ b/test/fixtures/controller.radar/borderJoinStyle/value.js
@@ -35,9 +35,11 @@ module.exports = {
                        layout: {
                                padding: 32
                        },
-                       scale: {
-                               display: false,
-                               beginAtZero: true
+                       scales: {
+                               r: {
+                                       display: false,
+                                       beginAtZero: true
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/borderWidth/scriptable.js b/test/fixtures/controller.radar/borderWidth/scriptable.js
index 99ec83bd45ab25b57553c0e4feed8ff37d7c52a3..dc0a8e0cf5f290fdcfddb278a97cc9fbaa79b3e5 100644 (file)
--- a/test/fixtures/controller.radar/borderWidth/scriptable.js
+++ b/test/fixtures/controller.radar/borderWidth/scriptable.js
@@ -36,10 +36,13 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
+
                }
        },
        options: {

diff --git a/test/fixtures/controller.radar/borderWidth/value.js b/test/fixtures/controller.radar/borderWidth/value.js
index 3292c0b04367c02ef9d7e3b4cd84a8fb1527b67d..91880c36eb5f8a19d146cdd2cce6097e9ff14ea9 100644 (file)
--- a/test/fixtures/controller.radar/borderWidth/value.js
+++ b/test/fixtures/controller.radar/borderWidth/value.js
@@ -27,10 +27,13 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
+
                }
        },
        options: {

diff --git a/test/fixtures/controller.radar/borderWidth/zero.js b/test/fixtures/controller.radar/borderWidth/zero.js
index 1298b0ab1b3fb12774ba9c4b1b23a02c5d232bd9..c7110b9be7480e50003102bbde830cdc897acfca 100644 (file)
--- a/test/fixtures/controller.radar/borderWidth/zero.js
+++ b/test/fixtures/controller.radar/borderWidth/zero.js
@@ -29,10 +29,13 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
+
                }
        },
        options: {

diff --git a/test/fixtures/controller.radar/fill/scriptable.js b/test/fixtures/controller.radar/fill/scriptable.js
index aef77d0daaece5180bf27d5d5117f83f8727a6e6..b8d42b3ad78a754dee3c6c68f555c157cbebaf5e 100644 (file)
--- a/test/fixtures/controller.radar/fill/scriptable.js
+++ b/test/fixtures/controller.radar/fill/scriptable.js
@@ -27,9 +27,11 @@ module.exports = {
                                        }
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        },
                        plugins: {
                                legend: false,

diff --git a/test/fixtures/controller.radar/fill/value.js b/test/fixtures/controller.radar/fill/value.js
index 6e31a41c2c3542f40e7e2168da458263330eb178..8f72f59d92c9f85c4c439c51f5a32aafd88d58a1 100644 (file)
--- a/test/fixtures/controller.radar/fill/value.js
+++ b/test/fixtures/controller.radar/fill/value.js
@@ -23,9 +23,11 @@ module.exports = {
                                        fill: true
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        },
                        plugins: {
                                legend: false,

diff --git a/test/fixtures/controller.radar/point-style.json b/test/fixtures/controller.radar/point-style.json
index cf119b046d65ecf66477b67dab65856664e29291..6375eb67b3040fa5fd68a518963d23ffb76d4cbf 100644 (file)
--- a/test/fixtures/controller.radar/point-style.json
+++ b/test/fixtures/controller.radar/point-style.json
@@ -1,91 +1,97 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
-            "datasets": [{
-                "borderColor": "transparent",
-                "data": [3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
-                "pointBackgroundColor": "#00ff00",
-                "pointBorderColor": "transparent",
-                "pointBorderWidth": 0,
-                "pointRadius": 16,
-                "pointStyle": [
-                    "circle",
-                    "cross",
-                    "crossRot",
-                    "dash",
-                    "line",
-                    "rect",
-                    "rectRounded",
-                    "rectRot",
-                    "star",
-                    "triangle"
-                ]
-            }, {
-                "borderColor": "transparent",
-                "data": [2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
-                "pointBackgroundColor": "transparent",
-                "pointBorderColor": "#0000ff",
-                "pointBorderWidth": 1,
-                "pointRadius": 16,
-                "pointStyle": [
-                    "circle",
-                    "cross",
-                    "crossRot",
-                    "dash",
-                    "line",
-                    "rect",
-                    "rectRounded",
-                    "rectRot",
-                    "star",
-                    "triangle"
-                ]
-            }, {
-                "borderColor": "transparent",
-                "data": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-                "pointBackgroundColor": "#00ff00",
-                "pointBorderColor": "#0000ff",
-                "pointBorderWidth": 1,
-                "pointRadius": 16,
-                "pointStyle": [
-                    "circle",
-                    "cross",
-                    "crossRot",
-                    "dash",
-                    "line",
-                    "rect",
-                    "rectRounded",
-                    "rectRot",
-                    "star",
-                    "triangle"
-                ]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+      "datasets": [
+        {
+          "borderColor": "transparent",
+          "data": [3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
+          "pointBackgroundColor": "#00ff00",
+          "pointBorderColor": "transparent",
+          "pointBorderWidth": 0,
+          "pointRadius": 16,
+          "pointStyle": [
+            "circle",
+            "cross",
+            "crossRot",
+            "dash",
+            "line",
+            "rect",
+            "rectRounded",
+            "rectRot",
+            "star",
+            "triangle"
+          ]
         },
-        "options": {
-            "responsive": false,
-            "scale": {
-                "display": false,
-                "min": 0,
-                "max": 3
-            },
-            "elements": {
-                "line": {
-                    "fill": false
-                }
-            },
-            "layout": {
-                "padding": {
-                    "left": 24,
-                    "right": 24
-                }
-            }
+        {
+          "borderColor": "transparent",
+          "data": [2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
+          "pointBackgroundColor": "transparent",
+          "pointBorderColor": "#0000ff",
+          "pointBorderWidth": 1,
+          "pointRadius": 16,
+          "pointStyle": [
+            "circle",
+            "cross",
+            "crossRot",
+            "dash",
+            "line",
+            "rect",
+            "rectRounded",
+            "rectRot",
+            "star",
+            "triangle"
+          ]
+        },
+        {
+          "borderColor": "transparent",
+          "data": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+          "pointBackgroundColor": "#00ff00",
+          "pointBorderColor": "#0000ff",
+          "pointBorderWidth": 1,
+          "pointRadius": 16,
+          "pointStyle": [
+            "circle",
+            "cross",
+            "crossRot",
+            "dash",
+            "line",
+            "rect",
+            "rectRounded",
+            "rectRot",
+            "star",
+            "triangle"
+          ]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 512,
-            "width": 512
+      "responsive": false,
+      "scales": {
+        "r": {
+          "display": false,
+          "min": 0,
+          "max": 3
+        }
+      },
+      "elements": {
+        "line": {
+          "fill": false
         }
+      },
+      "layout": {
+        "padding": {
+          "left": 24,
+          "right": 24
+        }
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 512,
+      "width": 512
     }
+  }
 }

diff --git a/test/fixtures/controller.radar/pointBackgroundColor/indexable.js b/test/fixtures/controller.radar/pointBackgroundColor/indexable.js
index 4f1ec38017dd701a649871ee1c955aa6ef0b6e14..2bfb94caf403d3e801403a223414161ebf7658f8 100644 (file)
--- a/test/fixtures/controller.radar/pointBackgroundColor/indexable.js
+++ b/test/fixtures/controller.radar/pointBackgroundColor/indexable.js
@@ -39,9 +39,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointBackgroundColor/scriptable.js b/test/fixtures/controller.radar/pointBackgroundColor/scriptable.js
index 41009805dd177dae04d93d63f066cb3c06b4b4e9..7adbd97f04e229ad0a1c9aa728be2899199a7fcf 100644 (file)
--- a/test/fixtures/controller.radar/pointBackgroundColor/scriptable.js
+++ b/test/fixtures/controller.radar/pointBackgroundColor/scriptable.js
@@ -37,9 +37,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointBackgroundColor/value.js b/test/fixtures/controller.radar/pointBackgroundColor/value.js
index 469e5ec1eb209bb4b26e4581af186116c39dcbe2..66e1d416e60029066ef5377d4fd1f5438ea2fd0e 100644 (file)
--- a/test/fixtures/controller.radar/pointBackgroundColor/value.js
+++ b/test/fixtures/controller.radar/pointBackgroundColor/value.js
@@ -25,9 +25,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointBorderColor/indexable.js b/test/fixtures/controller.radar/pointBorderColor/indexable.js
index 90fa772e45778e64ea65871194962c6603fe22a9..13351597872d9d290ec498609b0a31e23ae0a371 100644 (file)
--- a/test/fixtures/controller.radar/pointBorderColor/indexable.js
+++ b/test/fixtures/controller.radar/pointBorderColor/indexable.js
@@ -40,9 +40,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointBorderColor/scriptable.js b/test/fixtures/controller.radar/pointBorderColor/scriptable.js
index da65f1e19d15634b4bbde40ea24061ca48cd23d1..9e0cf8b8912fe8a30d07db32ed45351b15e5aa26 100644 (file)
--- a/test/fixtures/controller.radar/pointBorderColor/scriptable.js
+++ b/test/fixtures/controller.radar/pointBorderColor/scriptable.js
@@ -38,9 +38,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointBorderColor/value.js b/test/fixtures/controller.radar/pointBorderColor/value.js
index d46c2b875e07249f35b04aa048794630896f6790..ef4fdbebf672a17873ad67a3bbfc5211b4dabe1d 100644 (file)
--- a/test/fixtures/controller.radar/pointBorderColor/value.js
+++ b/test/fixtures/controller.radar/pointBorderColor/value.js
@@ -26,9 +26,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointBorderWidth/indexable.js b/test/fixtures/controller.radar/pointBorderWidth/indexable.js
index 6f4b1e92c50c9cfd6aeb15dc0fcce47d656f19f7..7accea2d0f54f43f9c42cfa782458ea19d6c1e76 100644 (file)
--- a/test/fixtures/controller.radar/pointBorderWidth/indexable.js
+++ b/test/fixtures/controller.radar/pointBorderWidth/indexable.js
@@ -31,9 +31,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointBorderWidth/scriptable.js b/test/fixtures/controller.radar/pointBorderWidth/scriptable.js
index 2c3b65ed509c593eb1b29a721e9f564bd859f56a..65bd8480d362ee42843be5dca361d9556a1125d2 100644 (file)
--- a/test/fixtures/controller.radar/pointBorderWidth/scriptable.js
+++ b/test/fixtures/controller.radar/pointBorderWidth/scriptable.js
@@ -37,9 +37,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointBorderWidth/value.js b/test/fixtures/controller.radar/pointBorderWidth/value.js
index 9c881bbcab0e4cb346b7603763caa615495ccf3a..91555695d0a6592d162242ad7b70312587a44496 100644 (file)
--- a/test/fixtures/controller.radar/pointBorderWidth/value.js
+++ b/test/fixtures/controller.radar/pointBorderWidth/value.js
@@ -27,9 +27,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointStyle/indexable.js b/test/fixtures/controller.radar/pointStyle/indexable.js
index 8724a3648573adfa9b0959b19ab0aeca60bd2272..b9cf41dfa112d2cde4603c75d4b41c44c18f408a 100644 (file)
--- a/test/fixtures/controller.radar/pointStyle/indexable.js
+++ b/test/fixtures/controller.radar/pointStyle/indexable.js
@@ -43,9 +43,11 @@ module.exports = {
                                        radius: 10
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointStyle/scriptable.js b/test/fixtures/controller.radar/pointStyle/scriptable.js
index 3f3210b6b1423ce968cd7a42e55858553effdb49..eac8628d08700e8194a3f18f8dc48880fa30f621 100644 (file)
--- a/test/fixtures/controller.radar/pointStyle/scriptable.js
+++ b/test/fixtures/controller.radar/pointStyle/scriptable.js
@@ -41,9 +41,11 @@ module.exports = {
                                        radius: 10,
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/pointStyle/value.js b/test/fixtures/controller.radar/pointStyle/value.js
index 08596a870c3995e4ddff8ce11f7adb739b393ab8..7197528816e946edfa5f53cac7b65bcae6a53236 100644 (file)
--- a/test/fixtures/controller.radar/pointStyle/value.js
+++ b/test/fixtures/controller.radar/pointStyle/value.js
@@ -27,9 +27,11 @@ module.exports = {
                                        radius: 10,
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/radius/indexable.js b/test/fixtures/controller.radar/radius/indexable.js
index 7b836149a6e3a43beccd05c3e67d2d71e63c40c6..9eb23f09177f45611fe8100e3b81d633884d3523 100644 (file)
--- a/test/fixtures/controller.radar/radius/indexable.js
+++ b/test/fixtures/controller.radar/radius/indexable.js
@@ -30,9 +30,11 @@ module.exports = {
                                        ],
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/radius/scriptable.js b/test/fixtures/controller.radar/radius/scriptable.js
index dcac83526f200119b59e590d722d557378ce6dbf..d5fc1a8145d8afab24d2e4639d2f00d5545e25be 100644 (file)
--- a/test/fixtures/controller.radar/radius/scriptable.js
+++ b/test/fixtures/controller.radar/radius/scriptable.js
@@ -36,9 +36,11 @@ module.exports = {
                                        },
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/radius/value.js b/test/fixtures/controller.radar/radius/value.js
index bf32433e86b4e60e2c6db8e0d420ce2a54342f6d..d7bc6b8e07d81f621a78a02a5ab821fec3862ba3 100644 (file)
--- a/test/fixtures/controller.radar/radius/value.js
+++ b/test/fixtures/controller.radar/radius/value.js
@@ -26,9 +26,11 @@ module.exports = {
                                        radius: 3,
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/rotation/indexable.js b/test/fixtures/controller.radar/rotation/indexable.js
index 6ab5d83ee886d3953217bf447f2c8e8980d36afd..8f22a396b351f44a31ba47653687dcffb8812927 100644 (file)
--- a/test/fixtures/controller.radar/rotation/indexable.js
+++ b/test/fixtures/controller.radar/rotation/indexable.js
@@ -32,9 +32,11 @@ module.exports = {
                                        ],
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/rotation/scriptable.js b/test/fixtures/controller.radar/rotation/scriptable.js
index 134673be103a4de1a6721e3fec487e2f3c99199a..890e02c2ab049b494427e6295ada34490c027bcc 100644 (file)
--- a/test/fixtures/controller.radar/rotation/scriptable.js
+++ b/test/fixtures/controller.radar/rotation/scriptable.js
@@ -38,9 +38,11 @@ module.exports = {
                                        radius: 10,
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/rotation/value.js b/test/fixtures/controller.radar/rotation/value.js
index c9a46ad438e6bf69c20074842fbfe84b69b0e50e..5a1959d668d85180d9daf93d6940bbca84a5aaf5 100644 (file)
--- a/test/fixtures/controller.radar/rotation/value.js
+++ b/test/fixtures/controller.radar/rotation/value.js
@@ -28,9 +28,11 @@ module.exports = {
                                        rotation: 0,
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        }
                }
        },

diff --git a/test/fixtures/controller.radar/showLine/value.js b/test/fixtures/controller.radar/showLine/value.js
index 3973195f0f0ebffd4370c48fe9f9005f1b589d9c..c933450dd0664ce9185b83e7f65ab238a3e482fb 100644 (file)
--- a/test/fixtures/controller.radar/showLine/value.js
+++ b/test/fixtures/controller.radar/showLine/value.js
@@ -31,9 +31,11 @@ module.exports = {
                                        fill: true
                                }
                        },
-                       scale: {
-                               display: false,
-                               min: -15
+                       scales: {
+                               r: {
+                                       display: false,
+                                       min: -15
+                               }
                        },
                        plugins: {
                                legend: false,

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json b/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json
index 65e6db8a99f3303a623cc977446c99ebbb8381a8..cee537e644b53df55428ae59c65f606f6201c2c5 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json
@@ -1,51 +1,58 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
-            }, {
-                "backgroundColor": "rgba(0, 192, 0, 0.25)",
-                "data": [5.5, 2, null, 4, 5, null, null, 2, 1]
-            }, {
-                "backgroundColor": "rgba(192, 0, 0, 0.25)",
-                "data": [7, 3, 4, 5, 6, 1, 4, null, null]
-            }, {
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [8, 7, 6.5, -6, -4, -6, 4, 5, 8]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "scale": {
-                "display": false,
-                "gridLines": {
-                    "circular": true
-                }
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": "end"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 192, 0, 0.25)",
+          "data": [5.5, 2, null, 4, 5, null, null, 2, 1]
+        },
+        {
+          "backgroundColor": "rgba(192, 0, 0, 0.25)",
+          "data": [7, 3, 4, 5, 6, 1, 4, null, null]
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [8, 7, 6.5, -6, -4, -6, 4, 5, 8]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "scales": {
+        "r": {
+          "display": false,
+          "gridLines": {
+            "circular": true
+          }
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": "end"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end-span.json b/test/fixtures/plugin.filler/fill-radar-boundary-end-span.json
index 5196559e95cf4b0e69e5e92f019d28bfc54da1af..531a28a3c975586d7ce16a26b8ba2b7fa918abd9 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-end-span.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-end-span.json
@@ -1,48 +1,55 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
-            }, {
-                "backgroundColor": "rgba(0, 192, 0, 0.25)",
-                "data": [5.5, 2, null, 4, 5, null, null, 2, 1]
-            }, {
-                "backgroundColor": "rgba(192, 0, 0, 0.25)",
-                "data": [7, 3, 4, 5, 6, 1, 4, null, null]
-            }, {
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [8, 7, 6.5, -6, -4, -6, 4, 5, 8]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": true,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": "end"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 192, 0, 0.25)",
+          "data": [5.5, 2, null, 4, 5, null, null, 2, 1]
+        },
+        {
+          "backgroundColor": "rgba(192, 0, 0, 0.25)",
+          "data": [7, 3, 4, 5, 6, 1, 4, null, null]
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [8, 7, 6.5, -6, -4, -6, 4, 5, 8]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": true,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": "end"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end.json b/test/fixtures/plugin.filler/fill-radar-boundary-end.json
index 94b755041cc138e9e507224adfb56be8c056fe0d..5ea718055521b1f7cf429673b8f5d3489c361fd3 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-end.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-end.json
@@ -1,48 +1,55 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
-            }, {
-                "backgroundColor": "rgba(0, 192, 0, 0.25)",
-                "data": [5.5, 2, null, 4, 5, null, null, 2, 1]
-            }, {
-                "backgroundColor": "rgba(192, 0, 0, 0.25)",
-                "data": [7, 3, 4, 5, 6, 1, 4, null, null]
-            }, {
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [8, 7, 6.5, -6, -4, -6, 4, 5, 8]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": "end"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 192, 0, 0.25)",
+          "data": [5.5, 2, null, 4, 5, null, null, 2, 1]
+        },
+        {
+          "backgroundColor": "rgba(192, 0, 0, 0.25)",
+          "data": [7, 3, 4, 5, 6, 1, 4, null, null]
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [8, 7, 6.5, -6, -4, -6, 4, 5, 8]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": "end"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json
index 51538c87a3501c67caa823fdc2ac7e48e8139e9d..d479c28a94eb4c0652e315102a3b348a9a57e2b1 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json
@@ -1,51 +1,58 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [null, null, 2, 4, 2, 1, -1, 1, 2]
-            }, {
-                "backgroundColor": "rgba(0, 192, 0, 0.25)",
-                "data": [4, 2, null, 3, 2.5, null, -2, 1.5, 3]
-            }, {
-                "backgroundColor": "rgba(192, 0, 0, 0.25)",
-                "data": [3.5, 2, 1, 2.5, -2, 3, -1, null, null]
-            }, {
-                "backgroundColor": "rgba(128, 0, 128, 0.25)",
-                "data": [5, 6, 5, -2, -4, -3, 4, 2, 4.5]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [null, null, 2, 4, 2, 1, -1, 1, 2]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "scale": {
-                "display": false,
-                "gridLines": {
-                    "circular": true
-                }
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": "origin"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 192, 0, 0.25)",
+          "data": [4, 2, null, 3, 2.5, null, -2, 1.5, 3]
+        },
+        {
+          "backgroundColor": "rgba(192, 0, 0, 0.25)",
+          "data": [3.5, 2, 1, 2.5, -2, 3, -1, null, null]
+        },
+        {
+          "backgroundColor": "rgba(128, 0, 128, 0.25)",
+          "data": [5, 6, 5, -2, -4, -3, 4, 2, 4.5]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "scales": {
+        "r": {
+          "display": false,
+          "gridLines": {
+            "circular": true
+          }
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": "origin"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json
index 17514471f9923e50e4a0a8d5fdd25f88f2a842fa..55e3cb2eb88c50398a4db3ea0b0f649e1507e4ef 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json
@@ -1,48 +1,55 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
-            }, {
-                "backgroundColor": "rgba(0, 192, 0, 0.25)",
-                "data": [6, 2, null, 4, 5, null, null, 2, 1]
-            }, {
-                "backgroundColor": "rgba(192, 0, 0, 0.25)",
-                "data": [7, 3, 4, 5, 6, 1, 4, null, null]
-            }, {
-                "backgroundColor": "rgba(0, 64, 192, 0.25)",
-                "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": true,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": "origin"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 192, 0, 0.25)",
+          "data": [6, 2, null, 4, 5, null, null, 2, 1]
+        },
+        {
+          "backgroundColor": "rgba(192, 0, 0, 0.25)",
+          "data": [7, 3, 4, 5, 6, 1, 4, null, null]
+        },
+        {
+          "backgroundColor": "rgba(0, 64, 192, 0.25)",
+          "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": true,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": "origin"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json
index 138a3a0fc5cd6420ecb5252816edfc59c2cd7337..25d6c468520759d15d983949992a66c7ee64cc7e 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json
@@ -1,49 +1,56 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [null, null, 2, 4, 2, 1, -1, 1, 2]
-            }, {
-                "backgroundColor": "rgba(0, 192, 0, 0.25)",
-                "data": [4, 2, null, 3, 2.5, null, -2, 1.5, 3]
-            }, {
-                "backgroundColor": "rgba(192, 0, 0, 0.25)",
-                "data": [3.5, 2, 1, 2.5, -2, 3, -1, null, null]
-            }, {
-                "backgroundColor": "rgba(128, 0, 128, 0.25)",
-                "data": [5, 6, 5, -2, -4, -3, 4, 2, 4.5]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [null, null, 2, 4, 2, 1, -1, 1, 2]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": true,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "tension": 0.5,
-                    "fill": "origin"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 192, 0, 0.25)",
+          "data": [4, 2, null, 3, 2.5, null, -2, 1.5, 3]
+        },
+        {
+          "backgroundColor": "rgba(192, 0, 0, 0.25)",
+          "data": [3.5, 2, 1, 2.5, -2, 3, -1, null, null]
+        },
+        {
+          "backgroundColor": "rgba(128, 0, 128, 0.25)",
+          "data": [5, 6, 5, -2, -4, -3, 4, 2, 4.5]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": true,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "tension": 0.5,
+          "fill": "origin"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json
index 7689972c723cdb93c703365995af9be7bdd0a149..957666f5550d3e6925bebf94a54f7ddfd4e41a25 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json
@@ -1,49 +1,56 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [null, null, 2, 4, 2, 1, -1, 1, 2]
-            }, {
-                "backgroundColor": "rgba(0, 192, 0, 0.25)",
-                "data": [4, 2, null, 3, 2.5, null, -2, 1.5, 3]
-            }, {
-                "backgroundColor": "rgba(192, 0, 0, 0.25)",
-                "data": [3.5, 2, 1, 2.5, -2, 3, -1, null, null]
-            }, {
-                "backgroundColor": "rgba(128, 0, 128, 0.25)",
-                "data": [5, 6, 5, -2, -4, -3, 4, 2, 4.5]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [null, null, 2, 4, 2, 1, -1, 1, 2]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "tension": 0.5,
-                    "fill": "origin"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 192, 0, 0.25)",
+          "data": [4, 2, null, 3, 2.5, null, -2, 1.5, 3]
+        },
+        {
+          "backgroundColor": "rgba(192, 0, 0, 0.25)",
+          "data": [3.5, 2, 1, 2.5, -2, 3, -1, null, null]
+        },
+        {
+          "backgroundColor": "rgba(128, 0, 128, 0.25)",
+          "data": [5, 6, 5, -2, -4, -3, 4, 2, 4.5]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "tension": 0.5,
+          "fill": "origin"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin.json
index 20abe5ce6582c2c8f59f0721371e6b090c7e5188..4c2068134142b2950710240e2a42fb42aea36d66 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-origin.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin.json
@@ -1,48 +1,55 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
-            }, {
-                "backgroundColor": "rgba(0, 192, 0, 0.25)",
-                "data": [6, 2, null, 4, 5, null, null, 2, 1]
-            }, {
-                "backgroundColor": "rgba(192, 0, 0, 0.25)",
-                "data": [7, 3, 4, 5, 6, 1, 4, null, null]
-            }, {
-                "backgroundColor": "rgba(0, 64, 192, 0.25)",
-                "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": "origin"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 192, 0, 0.25)",
+          "data": [6, 2, null, 4, 5, null, null, 2, 1]
+        },
+        {
+          "backgroundColor": "rgba(192, 0, 0, 0.25)",
+          "data": [7, 3, 4, 5, 6, 1, 4, null, null]
+        },
+        {
+          "backgroundColor": "rgba(0, 64, 192, 0.25)",
+          "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": "origin"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json b/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json
index a45fccd55669f01e7b54e54dd338492a39cc8da0..f10119f7a90117f1a3596cd5dcd958dd40dcf60e 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json
@@ -1,51 +1,58 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
-            }, {
-                "backgroundColor": "rgba(0, 255, 0, 0.25)",
-                "data": [6, 2, null, 4, 5, null, null, 2, 1]
-            }, {
-                "backgroundColor": "rgba(255, 0, 0, 0.25)",
-                "data": [7, 3, 4, 5, 6, 1, 4, null, null]
-            }, {
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "scale": {
-                "display": false,
-                "gridLines": {
-                    "circular": true
-                }
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": "start"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 255, 0, 0.25)",
+          "data": [6, 2, null, 4, 5, null, null, 2, 1]
+        },
+        {
+          "backgroundColor": "rgba(255, 0, 0, 0.25)",
+          "data": [7, 3, 4, 5, 6, 1, 4, null, null]
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "scales": {
+        "r": {
+          "display": false,
+          "gridLines": {
+            "circular": true
+          }
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": "start"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start-span.json b/test/fixtures/plugin.filler/fill-radar-boundary-start-span.json
index 0ae3843d89f3347456fbdc07535c0b763c844dd6..66a0c83f7a6ac230d2c3867a476699ae516f25ba 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-start-span.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-start-span.json
@@ -1,48 +1,55 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
-            }, {
-                "backgroundColor": "rgba(0, 255, 0, 0.25)",
-                "data": [6, 2, null, 4, 5, null, null, 2, 1]
-            }, {
-                "backgroundColor": "rgba(255, 0, 0, 0.25)",
-                "data": [7, 3, 4, 5, 6, 1, 4, null, null]
-            }, {
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": true,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": "start"
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 255, 0, 0.25)",
+          "data": [6, 2, null, 4, 5, null, null, 2, 1]
+        },
+        {
+          "backgroundColor": "rgba(255, 0, 0, 0.25)",
+          "data": [7, 3, 4, 5, 6, 1, 4, null, null]
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": true,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": "start"
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start.json b/test/fixtures/plugin.filler/fill-radar-boundary-start.json
index 10b126a46c5bffd1a9007a226a7095425991b9af..faede3e5db5fa46ab94ed7daa77a8f2955b7bc03 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-boundary-start.json
+++ b/test/fixtures/plugin.filler/fill-radar-boundary-start.json
@@ -1,47 +1,54 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
-            }, {
-                "backgroundColor": "rgba(0, 255, 0, 0.25)",
-                "data": [6, 2, null, 4, 5, null, null, 2, 1]
-            }, {
-                "backgroundColor": "rgba(255, 0, 0, 0.25)",
-                "data": [7, 3, 4, 5, 6, 1, 4, null, null]
-            }, {
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [null, null, 2, 3, 4, -4, -2, 1, 0]
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "plugins": {
-              "legend": false,
-              "title": false
-            },
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": "start"
-                }
-            }
+        {
+          "backgroundColor": "rgba(0, 255, 0, 0.25)",
+          "data": [6, 2, null, 4, 5, null, null, 2, 1]
+        },
+        {
+          "backgroundColor": "rgba(255, 0, 0, 0.25)",
+          "data": [7, 3, 4, 5, 6, 1, 4, null, null]
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [8, 7, 6, -6, -4, -6, 4, 5, 8]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "plugins": {
+        "legend": false,
+        "title": false
+      },
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": "start"
+        }
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-border.json b/test/fixtures/plugin.filler/fill-radar-dataset-border.json
index a42f5648ce9b846340aa74c1165e4e5b2bdf2637..b8774b380831b72cb314ec775567ba6da498f614 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-dataset-border.json
+++ b/test/fixtures/plugin.filler/fill-radar-dataset-border.json
@@ -1,57 +1,65 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(255, 0, 0, 0.25)",
-                "data": [null, null, 0, -1, 0, 1, 0, -1, 0],
-                "fill": 1
-            }, {
-                "backgroundColor": "rgba(0, 255, 0, 0.25)",
-                "data": [1, 0, null, 1, 0, null, -1, 0, 1],
-                "fill": "+1"
-            }, {
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [0, 2, 0, -2, 0, 2, 0],
-                "fill": 3
-            }, {
-                "backgroundColor": "rgba(255, 0, 255, 0.25)",
-                "data": [2, 0, -2, 0, 2, 0, -2, 0, 2],
-                "fill": "-2"
-            }, {
-                "backgroundColor": "rgba(255, 255, 0, 0.25)",
-                "data": [3, 1, -1, -3, -1, 1, 3, 1, -1],
-                "fill": "-1"
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(255, 0, 0, 0.25)",
+          "data": [null, null, 0, -1, 0, 1, 0, -1, 0],
+          "fill": 1
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                                       "borderColor": "black",
-                                       "borderWidth": 5,
-                    "tension": 0
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 255, 0, 0.25)",
+          "data": [1, 0, null, 1, 0, null, -1, 0, 1],
+          "fill": "+1"
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [0, 2, 0, -2, 0, 2, 0],
+          "fill": 3
+        },
+        {
+          "backgroundColor": "rgba(255, 0, 255, 0.25)",
+          "data": [2, 0, -2, 0, 2, 0, -2, 0, 2],
+          "fill": "-2"
+        },
+        {
+          "backgroundColor": "rgba(255, 255, 0, 0.25)",
+          "data": [3, 1, -1, -3, -1, 1, 3, 1, -1],
+          "fill": "-1"
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "black",
+          "borderWidth": 5,
+          "tension": 0
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-order.js b/test/fixtures/plugin.filler/fill-radar-dataset-order.js
index f24fc306f6114ef90de832f99d979a74ea7e947a..1e800486fcc25e3b16ee523bb777c3e31632054a 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-dataset-order.js
+++ b/test/fixtures/plugin.filler/fill-radar-dataset-order.js
@@ -23,8 +23,10 @@ module.exports = {
                                title: false,
                                tooltip: false
                        },
-                       scale: {
-                               display: false
+                       scales: {
+                               r: {
+                                       display: false
+                               }
                        }
                }
        }

diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-span.json b/test/fixtures/plugin.filler/fill-radar-dataset-span.json
index dd57cc5c120a69e3d138f00ddca524a950ac4420..aaff57cf439ddf7bbee6462564927361a2986521 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-dataset-span.json
+++ b/test/fixtures/plugin.filler/fill-radar-dataset-span.json
@@ -1,56 +1,64 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(255, 0, 0, 0.25)",
-                "data": [null, null, 0, -1, 0, 1, 0, -1, 0],
-                "fill": 1
-            }, {
-                "backgroundColor": "rgba(0, 255, 0, 0.25)",
-                "data": [1, 0, null, 1, 0, null, -1, 0, 1],
-                "fill": "+1"
-            }, {
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [0, 2, 0, -2, 0, 2, 0],
-                "fill": 3
-            }, {
-                "backgroundColor": "rgba(255, 0, 255, 0.25)",
-                "data": [2, 0, -2, 0, 2, 0, -2, 0, 2],
-                "fill": "-2"
-            }, {
-                "backgroundColor": "rgba(255, 255, 0, 0.25)",
-                "data": [3, 1, -1, -3, -1, 1, 3, 1, -1],
-                "fill": "-1"
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(255, 0, 0, 0.25)",
+          "data": [null, null, 0, -1, 0, 1, 0, -1, 0],
+          "fill": 1
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": true,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "tension": 0
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 255, 0, 0.25)",
+          "data": [1, 0, null, 1, 0, null, -1, 0, 1],
+          "fill": "+1"
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [0, 2, 0, -2, 0, 2, 0],
+          "fill": 3
+        },
+        {
+          "backgroundColor": "rgba(255, 0, 255, 0.25)",
+          "data": [2, 0, -2, 0, 2, 0, -2, 0, 2],
+          "fill": "-2"
+        },
+        {
+          "backgroundColor": "rgba(255, 255, 0, 0.25)",
+          "data": [3, 1, -1, -3, -1, 1, 3, 1, -1],
+          "fill": "-1"
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": true,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "tension": 0
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-spline.json b/test/fixtures/plugin.filler/fill-radar-dataset-spline.json
index 4b24e173e81e3955de95bb1c018061fad8105cad..ec34870e67d863930553e5123a9926fa15a30bd0 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-dataset-spline.json
+++ b/test/fixtures/plugin.filler/fill-radar-dataset-spline.json
@@ -1,55 +1,63 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(255, 0, 0, 0.25)",
-                "data": [null, null, 0, -1, 0, 1, 0, -1, 0],
-                "fill": 1
-            }, {
-                "backgroundColor": "rgba(0, 255, 0, 0.25)",
-                "data": [1, 0, null, 1, 0, null, -1, 0, 1],
-                "fill": "+1"
-            }, {
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [0, 2, 0, -2, 0, 2, 0],
-                "fill": 3
-            }, {
-                "backgroundColor": "rgba(255, 0, 255, 0.25)",
-                "data": [2, 0, -2, 0, 2, 0, -2, 0, 2],
-                "fill": "-2"
-            }, {
-                "backgroundColor": "rgba(255, 255, 0, 0.25)",
-                "data": [3, 1, -1, -3, -1, 1, 3, 1, -1],
-                "fill": "-1"
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(255, 0, 0, 0.25)",
+          "data": [null, null, 0, -1, 0, 1, 0, -1, 0],
+          "fill": 1
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "plugins": {
-              "legend": false,
-              "title": false
-            },
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "tension": 0.5
-                }
-            }
+        {
+          "backgroundColor": "rgba(0, 255, 0, 0.25)",
+          "data": [1, 0, null, 1, 0, null, -1, 0, 1],
+          "fill": "+1"
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [0, 2, 0, -2, 0, 2, 0],
+          "fill": 3
+        },
+        {
+          "backgroundColor": "rgba(255, 0, 255, 0.25)",
+          "data": [2, 0, -2, 0, 2, 0, -2, 0, 2],
+          "fill": "-2"
+        },
+        {
+          "backgroundColor": "rgba(255, 255, 0, 0.25)",
+          "data": [3, 1, -1, -3, -1, 1, 3, 1, -1],
+          "fill": "-1"
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "plugins": {
+        "legend": false,
+        "title": false
+      },
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "tension": 0.5
+        }
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-dataset.json b/test/fixtures/plugin.filler/fill-radar-dataset.json
index e4cd431b59b6286f0e5ec06f416e35b0e94feded..2a35cfe7f2f740132542e4a8d8250f79f5cff601 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-dataset.json
+++ b/test/fixtures/plugin.filler/fill-radar-dataset.json
@@ -1,56 +1,64 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(255, 0, 0, 0.25)",
-                "data": [null, null, 0, -1, 0, 1, 0, -1, 0],
-                "fill": 1
-            }, {
-                "backgroundColor": "rgba(0, 255, 0, 0.25)",
-                "data": [1, 0, null, 1, 0, null, -1, 0, 1],
-                "fill": "+1"
-            }, {
-                "backgroundColor": "rgba(0, 0, 255, 0.25)",
-                "data": [0, 2, 0, -2, 0, 2, 0],
-                "fill": 3
-            }, {
-                "backgroundColor": "rgba(255, 0, 255, 0.25)",
-                "data": [2, 0, -2, 0, 2, 0, -2, 0, 2],
-                "fill": "-2"
-            }, {
-                "backgroundColor": "rgba(255, 255, 0, 0.25)",
-                "data": [3, 1, -1, -3, -1, 1, 3, 1, -1],
-                "fill": "-1"
-            }]
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(255, 0, 0, 0.25)",
+          "data": [null, null, 0, -1, 0, 1, 0, -1, 0],
+          "fill": 1
         },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "scale": {
-                "display": false
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "tension": 0
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+        {
+          "backgroundColor": "rgba(0, 255, 0, 0.25)",
+          "data": [1, 0, null, 1, 0, null, -1, 0, 1],
+          "fill": "+1"
+        },
+        {
+          "backgroundColor": "rgba(0, 0, 255, 0.25)",
+          "data": [0, 2, 0, -2, 0, 2, 0],
+          "fill": 3
+        },
+        {
+          "backgroundColor": "rgba(255, 0, 255, 0.25)",
+          "data": [2, 0, -2, 0, 2, 0, -2, 0, 2],
+          "fill": "-2"
+        },
+        {
+          "backgroundColor": "rgba(255, 255, 0, 0.25)",
+          "data": [3, 1, -1, -3, -1, 1, 3, 1, -1],
+          "fill": "-1"
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "scales": {
+        "r": {
+          "display": false
         }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "tension": 0
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/plugin.filler/fill-radar-value.json b/test/fixtures/plugin.filler/fill-radar-value.json
index d6e91c240758fa217275fc11fe0273c9fea21ba7..882b536bac2e013d68df0123a207138df1e3038b 100644 (file)
--- a/test/fixtures/plugin.filler/fill-radar-value.json
+++ b/test/fixtures/plugin.filler/fill-radar-value.json
@@ -1,42 +1,46 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
-            "datasets": [{
-                "backgroundColor": "rgba(0, 0, 192, 0.25)",
-                "data": [0, -4, 2, 4, 2, 1, -1, 1, 2]
-            }]
-        },
-        "options": {
-            "responsive": false,
-            "spanGaps": false,
-            "scale": {
-                "display": false,
-                "gridLines": {
-                    "circular": true
-                }
-            },
-            "elements": {
-                "point": {
-                    "radius": 0
-                },
-                "line": {
-                    "borderColor": "transparent",
-                    "fill": { "value": 3 }
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false
-            }
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["0", "1", "2", "3", "4", "5", "6", "7", "8"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(0, 0, 192, 0.25)",
+          "data": [0, -4, 2, 4, 2, 1, -1, 1, 2]
         }
+      ]
     },
     "options": {
-        "canvas": {
-            "height": 256,
-            "width": 256
+      "responsive": false,
+      "spanGaps": false,
+      "scales": {
+        "r": {
+          "display": false,
+          "gridLines": {
+            "circular": true
+          }
+        }
+      },
+      "elements": {
+        "point": {
+          "radius": 0
+        },
+        "line": {
+          "borderColor": "transparent",
+          "fill": { "value": 3 }
         }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false
+      }
+    }
+  },
+  "options": {
+    "canvas": {
+      "height": 256,
+      "width": 256
     }
+  }
 }

diff --git a/test/fixtures/scale.radialLinear/anglelines-disable.json b/test/fixtures/scale.radialLinear/anglelines-disable.json
index 21b6b5eb3dfcd20e67a781fbf6be4a3880e956e6..2551b69a11f89bb712d5c25b3b539b11a957ee94 100644 (file)
--- a/test/fixtures/scale.radialLinear/anglelines-disable.json
+++ b/test/fixtures/scale.radialLinear/anglelines-disable.json
@@ -1,26 +1,28 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"]
-        },
-        "options": {
-            "responsive": false,
-            "scale": {
-                "gridLines": {
-                    "color": "rgb(0, 0, 0)",
-                    "lineWidth": 1
-                },
-                "angleLines": {
-                    "display": false
-                },
-                "pointLabels": {
-                    "display": false
-                },
-                "ticks": {
-                    "display": false
-                }
-            }
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"]
+    },
+    "options": {
+      "responsive": false,
+      "scales": {
+        "r": {
+          "gridLines": {
+            "color": "rgb(0, 0, 0)",
+            "lineWidth": 1
+          },
+          "angleLines": {
+            "display": false
+          },
+          "pointLabels": {
+            "display": false
+          },
+          "ticks": {
+            "display": false
+          }
         }
+      }
     }
+  }
 }

diff --git a/test/fixtures/scale.radialLinear/anglelines-indexable.js b/test/fixtures/scale.radialLinear/anglelines-indexable.js
index 1b2beac622a12fbe9f68e6834d08fb6b1dfb3930..2d0b6cb52d6b78b6868fa915cd2748e63ce3b085 100644 (file)
--- a/test/fixtures/scale.radialLinear/anglelines-indexable.js
+++ b/test/fixtures/scale.radialLinear/anglelines-indexable.js
@@ -6,19 +6,21 @@ module.exports = {
                },
                options: {
                        responsive: false,
-                       scale: {
-                               gridLines: {
-                                       display: true,
-                               },
-                               angleLines: {
-                                       color: ['red', 'green'],
-                                       lineWidth: [1, 5]
-                               },
-                               pointLabels: {
-                                       display: false
-                               },
-                               ticks: {
-                                       display: false
+                       scales: {
+                               r: {
+                                       gridLines: {
+                                               display: true,
+                                       },
+                                       angleLines: {
+                                               color: ['red', 'green'],
+                                               lineWidth: [1, 5]
+                                       },
+                                       pointLabels: {
+                                               display: false
+                                       },
+                                       ticks: {
+                                               display: false
+                                       }
                                }
                        }
                }

diff --git a/test/fixtures/scale.radialLinear/anglelines-scriptable.js b/test/fixtures/scale.radialLinear/anglelines-scriptable.js
index fad8dedb9dd4ab881f02d8fc28729583fe0b914f..96f117103bc45af9e8f1a36304971664526aff93 100644 (file)
--- a/test/fixtures/scale.radialLinear/anglelines-scriptable.js
+++ b/test/fixtures/scale.radialLinear/anglelines-scriptable.js
@@ -6,23 +6,25 @@ module.exports = {
                },
                options: {
                        responsive: false,
-                       scale: {
-                               gridLines: {
-                                       display: true,
-                               },
-                               angleLines: {
-                                       color: function(context) {
-                                               return context.index % 2 === 0 ? 'red' : 'green';
+                       scales: {
+                               r: {
+                                       gridLines: {
+                                               display: true,
                                        },
-                                       lineWidth: function(context) {
-                                               return context.index % 2 === 0 ? 1 : 5;
+                                       angleLines: {
+                                               color: function(context) {
+                                                       return context.index % 2 === 0 ? 'red' : 'green';
+                                               },
+                                               lineWidth: function(context) {
+                                                       return context.index % 2 === 0 ? 1 : 5;
+                                               },
                                        },
-                               },
-                               pointLabels: {
-                                       display: false
-                               },
-                               ticks: {
-                                       display: false
+                                       pointLabels: {
+                                               display: false
+                                       },
+                                       ticks: {
+                                               display: false
+                                       }
                                }
                        }
                }

diff --git a/test/fixtures/scale.radialLinear/border-dash.json b/test/fixtures/scale.radialLinear/border-dash.json
index 6d9e3b87931cea104e0a4ea773f1cf4608669b9b..ec683c4c674ab6d26c11c81f621afc2a32571349 100644 (file)
--- a/test/fixtures/scale.radialLinear/border-dash.json
+++ b/test/fixtures/scale.radialLinear/border-dash.json
@@ -1,31 +1,33 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"]
-        },
-        "options": {
-            "responsive": false,
-            "scale": {
-                "gridLines": {
-                    "color": "rgba(0, 0, 255, 0.5)",
-                    "lineWidth": 1,
-                    "borderDash": [4, 2],
-                    "borderDashOffset": 2
-                },
-                "angleLines": {
-                    "color": "rgba(0, 0, 255, 0.5)",
-                    "lineWidth": 1,
-                    "borderDash": [4, 2],
-                    "borderDashOffset": 2
-                },
-                "pointLabels": {
-                    "display": false
-                },
-                "ticks": {
-                    "display": false
-                }
-            }
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"]
+    },
+    "options": {
+      "responsive": false,
+      "scales": {
+        "r": {
+          "gridLines": {
+            "color": "rgba(0, 0, 255, 0.5)",
+            "lineWidth": 1,
+            "borderDash": [4, 2],
+            "borderDashOffset": 2
+          },
+          "angleLines": {
+            "color": "rgba(0, 0, 255, 0.5)",
+            "lineWidth": 1,
+            "borderDash": [4, 2],
+            "borderDashOffset": 2
+          },
+          "pointLabels": {
+            "display": false
+          },
+          "ticks": {
+            "display": false
+          }
         }
+      }
     }
+  }
 }

diff --git a/test/fixtures/scale.radialLinear/circular-border-dash.json b/test/fixtures/scale.radialLinear/circular-border-dash.json
index a1afb2ec91f54f08d09d41805700c85b8974c1e0..c6b0ad5f9fcf1028155827c8079fa46601729899 100644 (file)
--- a/test/fixtures/scale.radialLinear/circular-border-dash.json
+++ b/test/fixtures/scale.radialLinear/circular-border-dash.json
@@ -1,32 +1,34 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"]
-        },
-        "options": {
-            "responsive": false,
-            "scale": {
-                "gridLines": {
-                    "circular": true,
-                    "color": "rgba(0, 0, 255, 0.5)",
-                    "lineWidth": 1,
-                    "borderDash": [4, 2],
-                    "borderDashOffset": 2
-                },
-                "angleLines": {
-                    "color": "rgba(0, 0, 255, 0.5)",
-                    "lineWidth": 1,
-                    "borderDash": [4, 2],
-                    "borderDashOffset": 2
-                },
-                "pointLabels": {
-                    "display": false
-                },
-                "ticks": {
-                    "display": false
-                }
-            }
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"]
+    },
+    "options": {
+      "responsive": false,
+      "scales": {
+        "r": {
+          "gridLines": {
+            "circular": true,
+            "color": "rgba(0, 0, 255, 0.5)",
+            "lineWidth": 1,
+            "borderDash": [4, 2],
+            "borderDashOffset": 2
+          },
+          "angleLines": {
+            "color": "rgba(0, 0, 255, 0.5)",
+            "lineWidth": 1,
+            "borderDash": [4, 2],
+            "borderDashOffset": 2
+          },
+          "pointLabels": {
+            "display": false
+          },
+          "ticks": {
+            "display": false
+          }
         }
+      }
     }
+  }
 }

diff --git a/test/fixtures/scale.radialLinear/gridlines-disable.json b/test/fixtures/scale.radialLinear/gridlines-disable.json
index bc5c60ed4d94c53246a709c097f9edfe38bceb0f..45f8b8b12fd466617521cd0f3e57e6961234d840 100644 (file)
--- a/test/fixtures/scale.radialLinear/gridlines-disable.json
+++ b/test/fixtures/scale.radialLinear/gridlines-disable.json
@@ -1,26 +1,28 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"]
-        },
-        "options": {
-            "responsive": false,
-            "scale": {
-                "gridLines": {
-                    "display": false
-                },
-                "angleLines": {
-                    "color": "rgb(0, 0, 0)",
-                    "lineWidth": 1
-                },
-                "pointLabels": {
-                    "display": false
-                },
-                "ticks": {
-                    "display": false
-                }
-            }
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"]
+    },
+    "options": {
+      "responsive": false,
+      "scales": {
+        "r": {
+          "gridLines": {
+            "display": false
+          },
+          "angleLines": {
+            "color": "rgb(0, 0, 0)",
+            "lineWidth": 1
+          },
+          "pointLabels": {
+            "display": false
+          },
+          "ticks": {
+            "display": false
+          }
         }
+      }
     }
+  }
 }

diff --git a/test/fixtures/scale.radialLinear/gridlines-no-z.json b/test/fixtures/scale.radialLinear/gridlines-no-z.json
index 50b4d202b7ddd504af201388e7cede36b725d988..6252753b3a85bece7effb1856b0e6571420f2302 100644 (file)
--- a/test/fixtures/scale.radialLinear/gridlines-no-z.json
+++ b/test/fixtures/scale.radialLinear/gridlines-no-z.json
@@ -1,37 +1,41 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"],
-            "datasets": [{
-                "backgroundColor": "rgba(255, 0, 0, 1)",
-                "data": [1,2,3,3,3]
-            }]
-        },
-        "options": {
-            "responsive": false,
-            "scale": {
-                "gridLines": {
-                    "color": "rgba(0, 0, 0, 1)",
-                    "lineWidth": 1
-                },
-                "angleLines": {
-                    "color": "rgba(0, 0, 255, 1)",
-                    "lineWidth": 1
-                },
-                "pointLabels": {
-                    "display": false
-                },
-                "ticks": {
-                    "display": false
-                }
-            },
-            "plugins": {
-                "legend": false,
-                "title": false,
-                "tooltip": false,
-                "filler": true
-            }
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(255, 0, 0, 1)",
+          "data": [1, 2, 3, 3, 3]
         }
+      ]
+    },
+    "options": {
+      "responsive": false,
+      "scales": {
+        "r": {
+          "gridLines": {
+            "color": "rgba(0, 0, 0, 1)",
+            "lineWidth": 1
+          },
+          "angleLines": {
+            "color": "rgba(0, 0, 255, 1)",
+            "lineWidth": 1
+          },
+          "pointLabels": {
+            "display": false
+          },
+          "ticks": {
+            "display": false
+          }
+        }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false,
+        "filler": true
+      }
     }
+  }
 }

diff --git a/test/fixtures/scale.radialLinear/gridlines-scriptable.js b/test/fixtures/scale.radialLinear/gridlines-scriptable.js
index 5283884ccdfd2a8c3194e0668964063ca600eff5..280875c1e6ab59da6556eee9ecb20db5c79e82dd 100644 (file)
--- a/test/fixtures/scale.radialLinear/gridlines-scriptable.js
+++ b/test/fixtures/scale.radialLinear/gridlines-scriptable.js
@@ -6,25 +6,27 @@ module.exports = {
                },
                options: {
                        responsive: false,
-                       scale: {
-                               gridLines: {
-                                       display: true,
-                                       color: function(context) {
-                                               return context.index % 2 === 0 ? 'red' : 'green';
+                       scales: {
+                               r: {
+                                       gridLines: {
+                                               display: true,
+                                               color: function(context) {
+                                                       return context.index % 2 === 0 ? 'red' : 'green';
+                                               },
+                                               lineWidth: function(context) {
+                                                       return context.index % 2 === 0 ? 1 : 5;
+                                               },
                                        },
-                                       lineWidth: function(context) {
-                                               return context.index % 2 === 0 ? 1 : 5;
+                                       angleLines: {
+                                               color: 'rgba(255, 255, 255, 0.5)',
+                                               lineWidth: 2
                                        },
-                               },
-                               angleLines: {
-                                       color: 'rgba(255, 255, 255, 0.5)',
-                                       lineWidth: 2
-                               },
-                               pointLabels: {
-                                       display: false
-                               },
-                               ticks: {
-                                       display: false
+                                       pointLabels: {
+                                               display: false
+                                       },
+                                       ticks: {
+                                               display: false
+                                       }
                                }
                        }
                }

diff --git a/test/fixtures/scale.radialLinear/gridlines-z.json b/test/fixtures/scale.radialLinear/gridlines-z.json
index 4da021e0c3be4ae791abe40202f57589e112798a..70b1e456a364c3d4f462be610ef47de49b3707f4 100644 (file)
--- a/test/fixtures/scale.radialLinear/gridlines-z.json
+++ b/test/fixtures/scale.radialLinear/gridlines-z.json
@@ -1,38 +1,42 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"],
-            "datasets": [{
-                "backgroundColor": "rgba(255, 0, 0, 1)",
-                "data": [1,2,3,3,3]
-            }]
-        },
-        "options": {
-            "responsive": false,
-            "scale": {
-                "gridLines": {
-                    "color": "rgba(0, 0, 0, 1)",
-                    "lineWidth": 1,
-                    "z": 1
-                },
-                "angleLines": {
-                    "color": "rgba(0, 0, 255, 1)",
-                    "lineWidth": 1
-                },
-                "pointLabels": {
-                    "display": false
-                },
-                "ticks": {
-                    "display": false
-                }
-            },
-            "plugins": {
-              "legend": false,
-              "title": false,
-              "tooltip": false,
-              "filler": true
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"],
+      "datasets": [
+        {
+          "backgroundColor": "rgba(255, 0, 0, 1)",
+          "data": [1, 2, 3, 3, 3]
+        }
+      ]
+    },
+    "options": {
+      "responsive": false,
+      "scales": {
+        "r": {
+          "gridLines": {
+            "color": "rgba(0, 0, 0, 1)",
+            "lineWidth": 1,
+            "z": 1
+          },
+          "angleLines": {
+            "color": "rgba(0, 0, 255, 1)",
+            "lineWidth": 1
+          },
+          "pointLabels": {
+            "display": false
+          },
+          "ticks": {
+            "display": false
           }
         }
+      },
+      "plugins": {
+        "legend": false,
+        "title": false,
+        "tooltip": false,
+        "filler": true
+      }
     }
+  }
 }

diff --git a/test/fixtures/scale.radialLinear/indexable-gridlines.json b/test/fixtures/scale.radialLinear/indexable-gridlines.json
index d10b0d81fdd2047aac767fcf7ec46c0171a0ce0d..8c8dde5ce3b5b63bce6fe55d27bbb70c8b7d63ec 100644 (file)
--- a/test/fixtures/scale.radialLinear/indexable-gridlines.json
+++ b/test/fixtures/scale.radialLinear/indexable-gridlines.json
@@ -1,39 +1,41 @@
 {
-    "config": {
-        "type": "radar",
-        "data": {
-            "labels": ["A", "B", "C", "D", "E"]
-        },
-        "options": {
-            "responsive": false,
-            "scale": {
-                "gridLines": {
-                    "display": true,
-                    "color": [
-                        "rgba(0, 0, 0, 0.5)",
-                        "rgba(255, 255, 255, 0.5)",
-                        false,
-                        "",
-                        "rgba(255, 0, 0, 0.5)",
-                        "rgba(0, 255, 0, 0.5)",
-                        "rgba(0, 0, 255, 0.5)",
-                        "rgba(255, 255, 0, 0.5)",
-                        "rgba(255, 0, 255, 0.5)",
-                        "rgba(0, 255, 255, 0.5)"
-                    ],
-                    "lineWidth": [false, 0, 1, 2, 1, 2, 1, 2, 1, 2]
-                },
-                "angleLines": {
-                    "color": "rgba(255, 255, 255, 0.5)",
-                    "lineWidth": 2
-                },
-                "pointLabels": {
-                    "display": false
-                },
-                "ticks": {
-                    "display": false
-                }
-            }
+  "config": {
+    "type": "radar",
+    "data": {
+      "labels": ["A", "B", "C", "D", "E"]
+    },
+    "options": {
+      "responsive": false,
+      "scales": {
+        "r": {
+          "gridLines": {
+            "display": true,
+            "color": [
+              "rgba(0, 0, 0, 0.5)",
+              "rgba(255, 255, 255, 0.5)",
+              false,
+              "",
+              "rgba(255, 0, 0, 0.5)",
+              "rgba(0, 255, 0, 0.5)",
+              "rgba(0, 0, 255, 0.5)",
+              "rgba(255, 255, 0, 0.5)",
+              "rgba(255, 0, 255, 0.5)",
+              "rgba(0, 255, 255, 0.5)"
+            ],
+            "lineWidth": [false, 0, 1, 2, 1, 2, 1, 2, 1, 2]
+          },
+          "angleLines": {
+            "color": "rgba(255, 255, 255, 0.5)",
+            "lineWidth": 2
+          },
+          "pointLabels": {
+            "display": false
+          },
+          "ticks": {
+            "display": false
+          }
         }
+      }
     }
+  }
 }

diff --git a/test/specs/controller.radar.tests.js b/test/specs/controller.radar.tests.js
index ba149c14bcc075db53e5bdccd5023a3e483a74bf..9a9581fd567935780d053e242dc78d394d3c2225 100644 (file)
--- a/test/specs/controller.radar.tests.js
+++ b/test/specs/controller.radar.tests.js
@@ -389,7 +389,11 @@ describe('Chart.controllers.radar', function() {
                                labels: ['label1', 'label2', 'label3', 'label4']
                        },
                        options: {
-                               scale: {id: 'test'}
+                               scales: {
+                                       test: {
+                                               axis: 'r'
+                                       }
+                               }
                        }
                });
 

diff --git a/test/specs/core.controller.tests.js b/test/specs/core.controller.tests.js
index ddb83d9b58d4c25c7e06ee27165288cd0737f50e..3b6b68db6b966468084e05b348afd1e885553572 100644 (file)
--- a/test/specs/core.controller.tests.js
+++ b/test/specs/core.controller.tests.js
@@ -342,11 +342,12 @@ describe('Chart', function() {
                        var chart = acquireChart({
                                type: 'line',
                                options: {
-                                       scale: {
-                                               id: 'foo',
-                                               type: 'logarithmic',
-                                               _jasmineCheckC: 'c2',
-                                               _jasmineCheckD: 'd2'
+                                       scales: {
+                                               foo: {
+                                                       type: 'logarithmic',
+                                                       _jasmineCheckC: 'c2',
+                                                       _jasmineCheckD: 'd2'
+                                               }
                                        }
                                }
                        });

diff --git a/test/specs/scale.radialLinear.tests.js b/test/specs/scale.radialLinear.tests.js
index 894df96d9657cb585eccea1d09604ec206e4b004..be0c701ae6b51e99674e56f9bcb592441d3349f7 100644 (file)
--- a/test/specs/scale.radialLinear.tests.js
+++ b/test/specs/scale.radialLinear.tests.js
@@ -166,9 +166,11 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5', 'label6']
                        },
                        options: {
-                               scale: {
-                                       suggestedMin: -10,
-                                       suggestedMax: 10
+                               scales: {
+                                       r: {
+                                               suggestedMin: -10,
+                                               suggestedMax: 10
+                                       }
                                }
                        }
                });
@@ -187,9 +189,11 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5', 'label6']
                        },
                        options: {
-                               scale: {
-                                       min: -1010,
-                                       max: 1010
+                               scales: {
+                                       r: {
+                                               min: -1010,
+                                               max: 1010
+                                       }
                                }
                        }
                });
@@ -209,8 +213,10 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4']
                        },
                        options: {
-                               scale: {
-                                       beginAtZero: false
+                               scales: {
+                                       r: {
+                                               beginAtZero: false
+                                       }
                                }
                        }
                });
@@ -243,8 +249,10 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5']
                        },
                        options: {
-                               scale: {
-                                       reverse: true
+                               scales: {
+                                       r: {
+                                               reverse: true
+                                       }
                                }
                        }
                });
@@ -264,9 +272,11 @@ describe('Test the radial linear scale', function() {
                                }]
                        },
                        options: {
-                               scale: {
-                                       pointLabels: {
-                                               display: false
+                               scales: {
+                                       r: {
+                                               pointLabels: {
+                                                       display: false
+                                               }
                                        }
                                }
                        }
@@ -301,10 +311,12 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5']
                        },
                        options: {
-                               scale: {
-                                       ticks: {
-                                               callback: function(value, index) {
-                                                       return index.toString();
+                               scales: {
+                                       r: {
+                                               ticks: {
+                                                       callback: function(value, index) {
+                                                               return index.toString();
+                                                       }
                                                }
                                        }
                                }
@@ -325,10 +337,12 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5']
                        },
                        options: {
-                               scale: {
-                                       pointLabels: {
-                                               callback: function(value, index) {
-                                                       return index.toString();
+                               scales: {
+                                       r: {
+                                               pointLabels: {
+                                                       callback: function(value, index) {
+                                                               return index.toString();
+                                                       }
                                                }
                                        }
                                }
@@ -362,10 +376,12 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5']
                        },
                        options: {
-                               scale: {
-                                       pointLabels: {
-                                               callback: function(value, index) {
-                                                       return index.toString();
+                               scales: {
+                                       r: {
+                                               pointLabels: {
+                                                       callback: function(value, index) {
+                                                               return index.toString();
+                                                       }
                                                }
                                        }
                                }
@@ -387,10 +403,12 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5']
                        },
                        options: {
-                               scale: {
-                                       pointLabels: {
-                                               callback: function(value, index) {
-                                                       return index.toString();
+                               scales: {
+                                       r: {
+                                               pointLabels: {
+                                                       callback: function(value, index) {
+                                                               return index.toString();
+                                                       }
                                                }
                                        }
                                }
@@ -409,10 +427,12 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5']
                        },
                        options: {
-                               scale: {
-                                       pointLabels: {
-                                               callback: function(value, index) {
-                                                       return index.toString();
+                               scales: {
+                                       r: {
+                                               pointLabels: {
+                                                       callback: function(value, index) {
+                                                               return index.toString();
+                                                       }
                                                }
                                        }
                                }
@@ -443,10 +463,12 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5']
                        },
                        options: {
-                               scale: {
-                                       pointLabels: {
-                                               callback: function(value, index) {
-                                                       return index.toString();
+                               scales: {
+                                       r: {
+                                               pointLabels: {
+                                                       callback: function(value, index) {
+                                                               return index.toString();
+                                                       }
                                                }
                                        }
                                }
@@ -476,10 +498,12 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5']
                        },
                        options: {
-                               scale: {
-                                       pointLabels: {
-                                               callback: function(value, index) {
-                                                       return index.toString();
+                               scales: {
+                                       r: {
+                                               pointLabels: {
+                                                       callback: function(value, index) {
+                                                               return index.toString();
+                                                       }
                                                }
                                        }
                                },
@@ -515,14 +539,16 @@ describe('Test the radial linear scale', function() {
                                labels: ['label1', 'label2', 'label3', 'label4', 'label5']
                        },
                        options: {
-                               scale: {
-                                       pointLabels: {
-                                               callback: function(value, index) {
-                                                       return index.toString();
+                               scales: {
+                                       r: {
+                                               pointLabels: {
+                                                       callback: function(value, index) {
+                                                               return index.toString();
+                                                       }
+                                               },
+                                               ticks: {
+                                                       display: false
                                                }
-                                       },
-                                       ticks: {
-                                               display: false
                                        }
                                }
                        }

diff --git a/types/index.esm.d.ts b/types/index.esm.d.ts
index 200ec13790f3cc354b9d1b2ba5cf69f57521b08e..b6827e7591f2c334c33e429ed4a837883e4ee6de 100644 (file)
--- a/types/index.esm.d.ts
+++ b/types/index.esm.d.ts
@@ -446,7 +446,6 @@ export declare class Chart<
        readonly currentDevicePixelRatio: number;
        readonly chartArea: ChartArea;
        readonly scales: { [key: string]: Scale };
-       readonly scale: Scale | undefined;
        readonly attached: boolean;
 
        data: ChartData<TType, TData, TLabel>;