Fix inconsistent aspect ratio

chartjs · May 29, 2017 · 6e57071 · 6e57071
1 parent f3816b5
commit 6e57071
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
@@ -12,7 +12,6 @@ module.exports = function(Chart) {
 			// Boolean - Whether we animate scaling the Doughnut from the centre
 			animateScale: false
 		},
-		aspectRatio: 1,
 		hover: {
 			mode: 'single'
 		},

diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
@@ -29,7 +29,6 @@ module.exports = function(Chart) {
 		},
 
 		startAngle: -0.5 * Math.PI,
-		aspectRatio: 1,
 		legendCallback: function(chart) {
 			var text = [];
 			text.push('<ul class="' + chart.id + '-legend">');

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

diff --git a/test/specs/platform.dom.tests.js b/test/specs/platform.dom.tests.js
@@ -100,6 +100,9 @@ describe('Platform.dom', function() {
 		});
 
 		it('should use default "chart" aspect ratio for render and display sizes', function() {
+			var ratio = Chart.defaults.doughnut.aspectRatio;
+			Chart.defaults.doughnut.aspectRatio = 1;
+
 			var chart = acquireChart({
 				type: 'doughnut',
 				options: {
@@ -111,6 +114,8 @@ describe('Platform.dom', function() {
 				}
 			});
 
+			Chart.defaults.doughnut.aspectRatio = ratio;
+
 			expect(chart).toBeChartOfSize({
 				dw: 425, dh: 425,
 				rw: 425, rh: 425,