]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Fix radar default aspect ratio and samples
authorSimon Brunel <simonbrunel@users.noreply.github.com>
Fri, 23 Sep 2016 15:44:06 +0000 (17:44 +0200)
committerSimon Brunel <simonbrunel@users.noreply.github.com>
Fri, 23 Sep 2016 15:47:36 +0000 (17:47 +0200)
Now that the aspect ratio is correctly handled, fix samples for charts with aspect ratio of 1 which was vertically too large. Also fix the default aspect ratio for radar charts which wasn't applied when creating a chart directly using new Chart(ctx, { type: 'radar' }).

samples/doughnut.html
samples/polar-area.html
samples/radar-skip-points.html
samples/radar.html
src/charts/Chart.Radar.js
src/controllers/controller.radar.js

index 73c96ad802d228400d10e2dcbc4a837e1f4dd8b7..38a9d578234792fac4dabb3db614f301daec9f3e 100644 (file)
@@ -15,7 +15,7 @@
 </head>
 
 <body>
-    <div id="canvas-holder" style="width:75%">
+    <div id="canvas-holder" style="width:40%">
         <canvas id="chart-area" />
     </div>
     <button id="randomizeData">Randomize Data</button>
index ae21e1d44ab47f8cef05f3d63c1474c76b40a8f3..16572dd45143e3f0c47253a26eced71e5b11824a 100644 (file)
@@ -15,7 +15,7 @@
 </head>
 
 <body>
-    <div id="canvas-holder" style="width:75%">
+    <div id="canvas-holder" style="width:40%">
         <canvas id="chart-area"></canvas>
     </div>
     <button id="randomizeData">Randomize Data</button>
index 9d0816d4b478d82fcb94dafb437af7bb5f7dd0a0..c1680afd0c97fcb9fea540ef786268e307ab613a 100644 (file)
@@ -15,7 +15,7 @@
 </head>
 
 <body>
-    <div style="width:75%">
+    <div style="width:40%">
         <canvas id="canvas"></canvas>
     </div>
     <button id="randomizeData">Randomize Data</button>
index 4203cff15549b54f19f83d3c3fd448bf050dbfe8..eadcd9ecab81e3a23a881463e1b2af421112718b 100644 (file)
@@ -15,7 +15,7 @@
 </head>
 
 <body>
-    <div style="width:75%">
+    <div style="width:40%">
         <canvas id="canvas"></canvas>
     </div>
     <button id="randomizeData">Randomize Data</button>
index 1648e9faca65f323a01ad79cf2585eb9a2bfe946..d17bd5d8108739e61da33d04bdc6efc931c7a8bd 100644 (file)
@@ -3,7 +3,6 @@
 module.exports = function(Chart) {
 
        Chart.Radar = function(context, config) {
-               config.options = Chart.helpers.configMerge({aspectRatio: 1}, config.options);
                config.type = 'radar';
 
                return new Chart(context, config);
index 3c050595a83e8e28a034a419467746faf8ebb4d4..6232165f38b638a8cdd904dcd3328f5cff6ac091 100644 (file)
@@ -5,6 +5,7 @@ module.exports = function(Chart) {
        var helpers = Chart.helpers;
 
        Chart.defaults.radar = {
+               aspectRatio: 1,
                scale: {
                        type: 'radialLinear'
                },