From e21147cbb9e93797b1b3949a722b4958eed05a32 Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Mon, 20 Oct 2014 21:49:41 -0400
Subject: [PATCH 01/11] Prototype for hue() & default fillColor to use it.

---
 src/Chart.Doughnut.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Chart.Doughnut.js b/src/Chart.Doughnut.js
index 35de93c7f..0dab405c8 100644
--- a/src/Chart.Doughnut.js
+++ b/src/Chart.Doughnut.js
@@ -36,6 +36,14 @@
 
 	};
 
+	function hue(part, total) {
+		var h, s, v, c, x, m,
+			r = '00',
+			g = '00',
+			b = '00';
+		
+		return '#' + r + g + b;
+	}
 
 	Chart.Type.extend({
 		//Passing in a name registers this chart in the Chart namespace
@@ -94,7 +102,7 @@
 				value : segment.value,
 				outerRadius : (this.options.animateScale) ? 0 : this.outerRadius,
 				innerRadius : (this.options.animateScale) ? 0 : (this.outerRadius/100) * this.options.percentageInnerCutout,
-				fillColor : segment.color,
+				fillColor : segment.color || hue(index, this.segments.length),
 				highlightColor : segment.highlight || segment.color,
 				showStroke : this.options.segmentShowStroke,
 				strokeWidth : this.options.segmentStrokeWidth,
@@ -181,4 +189,4 @@
 		defaults : helpers.merge(defaultConfig,{percentageInnerCutout : 0})
 	});
 
-}).call(this);
\ No newline at end of file
+}).call(this);

From ae9eaa95c7634fcdb7684f650a050692a3f96b3c Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Mon, 20 Oct 2014 22:18:50 -0400
Subject: [PATCH 02/11] hue() complete but undebugged.

---
 src/Chart.Doughnut.js | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/Chart.Doughnut.js b/src/Chart.Doughnut.js
index 0dab405c8..dc69cd53f 100644
--- a/src/Chart.Doughnut.js
+++ b/src/Chart.Doughnut.js
@@ -37,12 +37,42 @@
 	};
 
 	function hue(part, total) {
-		var h, s, v, c, x, m,
+		var h = (part / total) * 360,
+			s = 1,
+			v = 1,
+			c = h * s,
+			x =  c * (1 - Math.abs((h / 60) % 2 - 1)),
+			m = v - c,
 			r = '00',
 			g = '00',
 			b = '00';
+		if (0 <= h && h < 60) {
+			r += Math.round(c + m).toString(16);
+			g += Math.round(x + m).toString(16);
+			b += Math.round(0 + m).toString(16);
+		} else if (60 <= h && h < 1200) {
+			r += Math.round(x + m).toString(16);
+			g += Math.round(c + m).toString(16);
+			b += Math.round(0 + m).toString(16);
+		} else if (120 <= h && h < 180) {
+			r += Math.round(0 + m).toString(16);
+			g += Math.round(c + m).toString(16);
+			b += Math.round(x + m).toString(16);
+		} else if (180 <= h && h < 240) {
+			r += Math.round(0 + m).toString(16);
+			g += Math.round(x + m).toString(16);
+			b += Math.round(c + m).toString(16);
+		} else if (240 <= h && h < 300) {
+			r += Math.round(x + m).toString(16);
+			g += Math.round(0 + m).toString(16);
+			b += Math.round(c + m).toString(16);
+		} else if (300 <= h && h < 360) {
+			r += Math.round(c + m).toString(16);
+			g += Math.round(0 + m).toString(16);
+			b += Math.round(x + m).toString(16);
+		}
 		
-		return '#' + r + g + b;
+		return '#' + r.substr(2) + g.substr(2) + b.substr(2);
 	}
 
 	Chart.Type.extend({

From 686ea499534ce1640492192de49197af5fa38a94 Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Tue, 21 Oct 2014 10:08:54 -0400
Subject: [PATCH 03/11] Hue uses switch & fixed other problems.

---
 src/Chart.Doughnut.js | 71 +++++++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/Chart.Doughnut.js b/src/Chart.Doughnut.js
index dc69cd53f..4a4c9afb0 100644
--- a/src/Chart.Doughnut.js
+++ b/src/Chart.Doughnut.js
@@ -37,42 +37,55 @@
 	};
 
 	function hue(part, total) {
+		// Given the total number of segments (total) and the index of a segment (part) returns a #rrggbb color for the segment
 		var h = (part / total) * 360,
 			s = 1,
 			v = 1,
 			c = h * s,
 			x =  c * (1 - Math.abs((h / 60) % 2 - 1)),
 			m = v - c,
-			r = '00',
-			g = '00',
-			b = '00';
-		if (0 <= h && h < 60) {
-			r += Math.round(c + m).toString(16);
-			g += Math.round(x + m).toString(16);
-			b += Math.round(0 + m).toString(16);
-		} else if (60 <= h && h < 1200) {
-			r += Math.round(x + m).toString(16);
-			g += Math.round(c + m).toString(16);
-			b += Math.round(0 + m).toString(16);
-		} else if (120 <= h && h < 180) {
-			r += Math.round(0 + m).toString(16);
-			g += Math.round(c + m).toString(16);
-			b += Math.round(x + m).toString(16);
-		} else if (180 <= h && h < 240) {
-			r += Math.round(0 + m).toString(16);
-			g += Math.round(x + m).toString(16);
-			b += Math.round(c + m).toString(16);
-		} else if (240 <= h && h < 300) {
-			r += Math.round(x + m).toString(16);
-			g += Math.round(0 + m).toString(16);
-			b += Math.round(c + m).toString(16);
-		} else if (300 <= h && h < 360) {
-			r += Math.round(c + m).toString(16);
-			g += Math.round(0 + m).toString(16);
-			b += Math.round(x + m).toString(16);
+			r,
+			g,
+			b;
+
+		switch (Math.floor(h / 60)) {
+			case 0: // 0 <= h < 60
+				r = c + m;
+				g = x + m;
+				b = 0 + m;
+			break;
+			case 1: // 60 <= h < 120
+				r = c + m;
+				g = x + m;
+				b = 0 + m;
+			break;
+			case 2: // 120 <= h < 180
+				r = c + m;
+				g = x + m;
+				b = 0 + m;
+			break;
+			case 3: // 180 <= h < 240
+				r = c + m;
+				g = x + m;
+				b = 0 + m;
+			break;
+			case 4: // 240 <= h < 300
+				r = c + m;
+				g = x + m;
+				b = 0 + m;
+			break;
+			case 5: // 300 <= h < 360
+				r = c + m;
+				g = x + m;
+				b = 0 + m;
+			break;
 		}
-		
-		return '#' + r.substr(2) + g.substr(2) + b.substr(2);
+
+		r = '00' + Math.round(r * 255).toString(16);
+		g = '00' + Math.round(g * 255).toString(16);
+		b = '00' + Math.round(b * 255).toString(16);
+
+		return '#' + r.substr(r.length - 2) + g.substr(g.length - 2) + b.substr(b.length - 2);
 	}
 
 	Chart.Type.extend({

From 8984e8c2c4aa42cbd216862d70b5eb25f38fe16e Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Tue, 21 Oct 2014 10:16:30 -0400
Subject: [PATCH 04/11] Create doughnut.color.html

To test the new version of doughnut.
---
 samples/doughnut.color.html | 57 +++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 samples/doughnut.color.html

diff --git a/samples/doughnut.color.html b/samples/doughnut.color.html
new file mode 100644
index 000000000..00b55038c
--- /dev/null
+++ b/samples/doughnut.color.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+	<head>
+		<title>Doughnut Chart</title>
+		<script src="../Chart.js"></script>
+		<style>
+			body{
+				padding: 0;
+				margin: 0;
+			}
+			#canvas-holder{
+				width:30%;
+			}
+		</style>
+	</head>
+	<body>
+		<div id="canvas-holder">
+			<canvas id="chart-area" width="500" height="500"/>
+		</div>
+
+
+	<script>
+
+		var doughnutData = [
+				{
+					value: 1,
+					label: "One"
+				},
+				{
+					value: 2,
+					label: "Two"
+				},
+				{
+					value: 3,
+					label: "Three"
+				},
+				{
+					value: 4,
+					label: "Four"
+				},
+				{
+					value: 5,
+					label: "Five"
+				}
+
+			];
+
+			window.onload = function(){
+				var ctx = document.getElementById("chart-area").getContext("2d");
+				window.myDoughnut = new Chart(ctx).Doughnut(doughnutData, {responsive : true});
+			};
+
+
+
+	</script>
+	</body>
+</html>

From 7e21cb4e04807ab55f4ab61b41fcf6788f66a023 Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Tue, 21 Oct 2014 10:19:58 -0400
Subject: [PATCH 05/11] Pointed to core and doughnut.

---
 samples/doughnut.color.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/samples/doughnut.color.html b/samples/doughnut.color.html
index 00b55038c..5457fd094 100644
--- a/samples/doughnut.color.html
+++ b/samples/doughnut.color.html
@@ -2,7 +2,8 @@
 <html>
 	<head>
 		<title>Doughnut Chart</title>
-		<script src="../Chart.js"></script>
+		<script src="../src/Chart.Core.js"></script>
+		<script src="../src/Chart.Doughnut.js"></script>
 		<style>
 			body{
 				padding: 0;

From fdc9be3e23b5112cee004323e335ce6b1d72c417 Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Tue, 21 Oct 2014 13:28:45 -0400
Subject: [PATCH 06/11] Correction in algorithm.

---
 src/Chart.Doughnut.js | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/Chart.Doughnut.js b/src/Chart.Doughnut.js
index 4a4c9afb0..b3ab6ebfc 100644
--- a/src/Chart.Doughnut.js
+++ b/src/Chart.Doughnut.js
@@ -41,7 +41,7 @@
 		var h = (part / total) * 360,
 			s = 1,
 			v = 1,
-			c = h * s,
+			c = v * s,
 			x =  c * (1 - Math.abs((h / 60) % 2 - 1)),
 			m = v - c,
 			r,
@@ -55,29 +55,29 @@
 				b = 0 + m;
 			break;
 			case 1: // 60 <= h < 120
-				r = c + m;
-				g = x + m;
+				r = x + m;
+				g = c + m;
 				b = 0 + m;
 			break;
 			case 2: // 120 <= h < 180
-				r = c + m;
-				g = x + m;
-				b = 0 + m;
+				r = 0 + m;
+				g = c + m;
+				b = x + m;
 			break;
 			case 3: // 180 <= h < 240
-				r = c + m;
+				r = 0 + m;
 				g = x + m;
-				b = 0 + m;
+				b = c + m;
 			break;
 			case 4: // 240 <= h < 300
-				r = c + m;
-				g = x + m;
-				b = 0 + m;
+				r = x + m;
+				g = 0 + m;
+				b = c + m;
 			break;
 			case 5: // 300 <= h < 360
 				r = c + m;
-				g = x + m;
-				b = 0 + m;
+				g = 0 + m;
+				b = x + m;
 			break;
 		}
 
@@ -123,6 +123,13 @@
 			}
 			this.calculateTotal(data);
 
+			data = data.map(function (v, i, a){
+				if (!v.color) {
+					v.color = hue(i, a.length);
+					return v;
+				}
+			});
+
 			helpers.each(data,function(datapoint, index){
 				this.addData(datapoint, index, true);
 			},this);

From 73faf3413bbcc0819c02e84b87b206c653887ce0 Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Tue, 21 Oct 2014 13:32:45 -0400
Subject: [PATCH 07/11] Update Chart.Doughnut.js

---
 src/Chart.Doughnut.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Chart.Doughnut.js b/src/Chart.Doughnut.js
index b3ab6ebfc..f1dcaf1c1 100644
--- a/src/Chart.Doughnut.js
+++ b/src/Chart.Doughnut.js
@@ -152,7 +152,7 @@
 				value : segment.value,
 				outerRadius : (this.options.animateScale) ? 0 : this.outerRadius,
 				innerRadius : (this.options.animateScale) ? 0 : (this.outerRadius/100) * this.options.percentageInnerCutout,
-				fillColor : segment.color || hue(index, this.segments.length),
+				fillColor : segment.color,
 				highlightColor : segment.highlight || segment.color,
 				showStroke : this.options.segmentShowStroke,
 				strokeWidth : this.options.segmentStrokeWidth,

From b9776736d459124ff49a371817a23f2cb9328510 Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Mon, 26 Jan 2015 16:28:11 -0500
Subject: [PATCH 08/11] Removed custom hue(), using hsl()

---
 src/Chart.Doughnut.js | 54 +------------------------------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/src/Chart.Doughnut.js b/src/Chart.Doughnut.js
index f1dcaf1c1..ae2ce937e 100644
--- a/src/Chart.Doughnut.js
+++ b/src/Chart.Doughnut.js
@@ -36,58 +36,6 @@
 
 	};
 
-	function hue(part, total) {
-		// Given the total number of segments (total) and the index of a segment (part) returns a #rrggbb color for the segment
-		var h = (part / total) * 360,
-			s = 1,
-			v = 1,
-			c = v * s,
-			x =  c * (1 - Math.abs((h / 60) % 2 - 1)),
-			m = v - c,
-			r,
-			g,
-			b;
-
-		switch (Math.floor(h / 60)) {
-			case 0: // 0 <= h < 60
-				r = c + m;
-				g = x + m;
-				b = 0 + m;
-			break;
-			case 1: // 60 <= h < 120
-				r = x + m;
-				g = c + m;
-				b = 0 + m;
-			break;
-			case 2: // 120 <= h < 180
-				r = 0 + m;
-				g = c + m;
-				b = x + m;
-			break;
-			case 3: // 180 <= h < 240
-				r = 0 + m;
-				g = x + m;
-				b = c + m;
-			break;
-			case 4: // 240 <= h < 300
-				r = x + m;
-				g = 0 + m;
-				b = c + m;
-			break;
-			case 5: // 300 <= h < 360
-				r = c + m;
-				g = 0 + m;
-				b = x + m;
-			break;
-		}
-
-		r = '00' + Math.round(r * 255).toString(16);
-		g = '00' + Math.round(g * 255).toString(16);
-		b = '00' + Math.round(b * 255).toString(16);
-
-		return '#' + r.substr(r.length - 2) + g.substr(g.length - 2) + b.substr(b.length - 2);
-	}
-
 	Chart.Type.extend({
 		//Passing in a name registers this chart in the Chart namespace
 		name: "Doughnut",
@@ -125,7 +73,7 @@
 
 			data = data.map(function (v, i, a){
 				if (!v.color) {
-					v.color = hue(i, a.length);
+					v.color = 'hsl(' + (360 * i / a.length) * 360 + ', 100%, 50%)';
 					return v;
 				}
 			});

From 0f49be56a4b3f6f7e2b5a5b6a2c4b0e1e628ea19 Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Mon, 26 Jan 2015 16:33:24 -0500
Subject: [PATCH 09/11] Update 05-Pie-Doughnut-Chart.md

---
 docs/05-Pie-Doughnut-Chart.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/05-Pie-Doughnut-Chart.md b/docs/05-Pie-Doughnut-Chart.md
index 9c2b8a777..84bc08a81 100644
--- a/docs/05-Pie-Doughnut-Chart.md
+++ b/docs/05-Pie-Doughnut-Chart.md
@@ -55,7 +55,7 @@ var data = [
 ]
 ```
 
-For a pie chart, you must pass in an array of objects with a value and a color property. The value attribute should be a number, Chart.js will total all of the numbers and calculate the relative proportion of each. The color attribute should be a string. Similar to CSS, for this string you can use HEX notation, RGB, RGBA or HSL.
+For a pie chart, you must pass in an array of objects with a value and an optional color property. The value attribute should be a number, Chart.js will total all of the numbers and calculate the relative proportion of each. The color attribute should be a string. Similar to CSS, for this string you can use HEX notation, RGB, RGBA or HSL.
 
 ### Chart options
 
@@ -155,4 +155,4 @@ Calling `removeData(index)` on your Chart instance will remove segment at that p
 ```javascript
 myDoughnutChart.removeData();
 // Other segments will update to fill the empty space left.
-```
\ No newline at end of file
+```

From b8b7c85c5e11a713a8773f432c4028c2e06a8a8b Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Fri, 30 Jan 2015 11:01:44 -0500
Subject: [PATCH 10/11] Using helper.each instead of Array.prototype.map

---
 src/Chart.Doughnut.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Chart.Doughnut.js b/src/Chart.Doughnut.js
index ae2ce937e..8e60879a0 100644
--- a/src/Chart.Doughnut.js
+++ b/src/Chart.Doughnut.js
@@ -79,6 +79,9 @@
 			});
 
 			helpers.each(data,function(datapoint, index){
+				if (!datapoint.color) {
+					datapoint.color = 'hsl(' + (360 * index / data.length) + ', 100%, 50%)';
+				}
 				this.addData(datapoint, index, true);
 			},this);
 

From bb6237a15e011b7cbf75fc0e6eb3c8d9e9733658 Mon Sep 17 00:00:00 2001
From: Christopher Weiss <cmweiss@gmail.com>
Date: Fri, 30 Jan 2015 11:12:08 -0500
Subject: [PATCH 11/11] Accidentally left in Array.prototype.map.

---
 src/Chart.Doughnut.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Chart.Doughnut.js b/src/Chart.Doughnut.js
index 8e60879a0..6233ed760 100644
--- a/src/Chart.Doughnut.js
+++ b/src/Chart.Doughnut.js
@@ -71,13 +71,6 @@
 			}
 			this.calculateTotal(data);
 
-			data = data.map(function (v, i, a){
-				if (!v.color) {
-					v.color = 'hsl(' + (360 * i / a.length) * 360 + ', 100%, 50%)';
-					return v;
-				}
-			});
-
 			helpers.each(data,function(datapoint, index){
 				if (!datapoint.color) {
 					datapoint.color = 'hsl(' + (360 * index / data.length) + ', 100%, 50%)';