Update charts with default aspect ratio of 1 where it makes sense. If the canvas...

diff --git a/src/charts/Chart.Doughnut.js b/src/charts/Chart.Doughnut.js
index ccea714f31d0d937f1933f0c76b27fa45589e73a..333a0bbebebdef9cf9912c76ff2cdf1aea075959 100644 (file)
--- a/src/charts/Chart.Doughnut.js
+++ b/src/charts/Chart.Doughnut.js
@@ -6,6 +6,7 @@
        var helpers = Chart.helpers;
 
        var defaultConfig = {
+               aspectRatio: 1,
                legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i = 0; i < data.datasets[0].data.length; i++){%><li><span style=\"background-color:<%=data.datasets[0].backgroundColor[i]%>\"><%if(data.labels && i < data.labels.length){%><%=data.labels[i]%><%}%></span></li><%}%></ul>",
        };
 

diff --git a/src/charts/Chart.PolarArea.js b/src/charts/Chart.PolarArea.js
index 7070a0d8f2475c6c8f13fb3d208fe7aca3443252..9dbdf1b39a1584fdd4579b45036ba240c948eba4 100644 (file)
--- a/src/charts/Chart.PolarArea.js
+++ b/src/charts/Chart.PolarArea.js
@@ -6,6 +6,7 @@
        var helpers = Chart.helpers;
 
        var defaultConfig = {
+               aspectRatio: 1,
                legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i = 0; i < data.datasets[0].data.length; i++){%><li><span style=\"background-color:<%=data.datasets[0].backgroundColor[i]%>\"><%if(data.labels && i < data.labels.length){%><%=data.labels[i]%><%}%></span></li><%}%></ul>",
        };
 

diff --git a/src/charts/Chart.Radar.js b/src/charts/Chart.Radar.js
index f5580783d661c034abcb4eeaa10de0c3c95189c4..2f1f8260620bd5387b29bf14b14b24c5d9372dee 100644 (file)
--- a/src/charts/Chart.Radar.js
+++ b/src/charts/Chart.Radar.js
@@ -5,7 +5,12 @@
        var Chart = root.Chart;
        var helpers = Chart.helpers;
 
+       var defaultConfig = {
+               aspectRatio: 1,
+       };
+
        Chart.Radar = function(context, config) {
+               config.options = helpers.configMerge(defaultConfig, config.options);
                config.type = 'radar';
 
                return new Chart(context, config);