From: Evert Timberg <evert.timberg@gmail.com>
Date: Sun, 20 Sep 2015 14:33:36 +0000 (-0400)
Subject: Ensure that radii are always >= 0 for doughnuts and polar area charts
X-Git-Tag: 2.0.0-alpha4~21^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8aa628821024f0c4d8b9f9a5c0908b8b8dc4d44e;p=thirdparty%2FChart.js.git

Ensure that radii are always >= 0 for doughnuts and polar area charts
---

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 2513a0689..d4586b4fc 100644
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -86,8 +86,8 @@
 
 		update: function(reset) {
 
-			this.chart.outerRadius = (helpers.min([this.chart.chart.width, this.chart.chart.height]) / 2) - this.chart.options.elements.arc.borderWidth / 2;
-			this.chart.innerRadius = this.chart.options.cutoutPercentage ? (this.chart.outerRadius / 100) * (this.chart.options.cutoutPercentage) : 1;
+			this.chart.outerRadius = Math.max((helpers.min([this.chart.chart.width, this.chart.chart.height]) / 2) - this.chart.options.elements.arc.borderWidth / 2, 0);
+			this.chart.innerRadius = Math.max(this.chart.options.cutoutPercentage ? (this.chart.outerRadius / 100) * (this.chart.options.cutoutPercentage) : 1, 0);
 			this.chart.radiusLength = (this.chart.outerRadius - this.chart.innerRadius) / this.chart.data.datasets.length;
 
 			this.getDataset().total = 0;
diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 4de24af6d..d832f09d1 100644
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -87,8 +87,8 @@
 			this.chart.scale.generateTicks();
 			this.chart.scale.buildYLabels();
 
-			this.chart.outerRadius = (helpers.min([this.chart.chart.width, this.chart.chart.height]) - this.chart.options.elements.arc.borderWidth / 2) / 2;
-			this.chart.innerRadius = this.chart.options.cutoutPercentage ? (this.chart.outerRadius / 100) * (this.chart.options.cutoutPercentage) : 1;
+			this.chart.outerRadius = Math.max((helpers.min([this.chart.chart.width, this.chart.chart.height]) - this.chart.options.elements.arc.borderWidth / 2) / 2, 0);
+			this.chart.innerRadius = Math.max(this.chart.options.cutoutPercentage ? (this.chart.outerRadius / 100) * (this.chart.options.cutoutPercentage) : 1, 0);
 			this.chart.radiusLength = (this.chart.outerRadius - this.chart.innerRadius) / this.chart.data.datasets.length;
 
 			this.getDataset().total = 0;