Fix radar default aspect ratio and samples

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' }).
chartjs · Sep 23, 2016 · d610987 · d610987
1 parent 16bcd6a
commit d610987
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/samples/doughnut.html b/samples/doughnut.html
@@ -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>

diff --git a/samples/polar-area.html b/samples/polar-area.html
@@ -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>

diff --git a/samples/radar-skip-points.html b/samples/radar-skip-points.html
@@ -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>

diff --git a/samples/radar.html b/samples/radar.html
@@ -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>

diff --git a/src/charts/Chart.Radar.js b/src/charts/Chart.Radar.js
@@ -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);

diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
@@ -5,6 +5,7 @@ module.exports = function(Chart) {
 	var helpers = Chart.helpers;
 
 	Chart.defaults.radar = {
+		aspectRatio: 1,
 		scale: {
 			type: 'radialLinear'
 		},