From 673e5d59a515c0dcfb5ce0ab550e04394d8a85c8 Mon Sep 17 00:00:00 2001
From: etimberg <evert.timberg@gmail.com>
Date: Wed, 18 Nov 2015 21:24:49 -0500
Subject: [PATCH 1/2] fix pie & doughnut legend

---
 src/charts/Chart.Doughnut.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/charts/Chart.Doughnut.js b/src/charts/Chart.Doughnut.js
index 05a9764bd..74c917323 100644
--- a/src/charts/Chart.Doughnut.js
+++ b/src/charts/Chart.Doughnut.js
@@ -7,7 +7,23 @@
 
 	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>",
+		legendCallback: function(chart) {
+			var text = [];
+			text.push('<ul class="' + chart.id + '-legend">');
+
+			if (chart.data.datasets.length) {
+				for (var i = 0; i < chart.data.datasets[0].data.length; ++i) {
+					text.push('<li><span style="background-color:' + chart.data.datasets[0].backgroundColor[i] + '">');
+					if (chart.data.labels[i]) {
+						text.push(chart.data.labels[i]);
+					}
+					text.push('</span></li>');
+				}
+			}
+
+			text.push('</ul>');
+			return text.join("");
+		}
 	};
 
 	Chart.Doughnut = function(context, config) {

From 7edcc0659bf3295532974d1d3569f3454290e8e7 Mon Sep 17 00:00:00 2001
From: etimberg <evert.timberg@gmail.com>
Date: Wed, 18 Nov 2015 21:30:16 -0500
Subject: [PATCH 2/2] Fix polar area legends

---
 src/charts/Chart.PolarArea.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/charts/Chart.PolarArea.js b/src/charts/Chart.PolarArea.js
index 20171f7f7..2b44bb9aa 100644
--- a/src/charts/Chart.PolarArea.js
+++ b/src/charts/Chart.PolarArea.js
@@ -7,7 +7,23 @@
 
 	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>",
+		legendCallback: function(chart) {
+			var text = [];
+			text.push('<ul class="' + chart.id + '-legend">');
+
+			if (chart.data.datasets.length) {
+				for (var i = 0; i < chart.data.datasets[0].data.length; ++i) {
+					text.push('<li><span style="background-color:' + chart.data.datasets[0].backgroundColor[i] + '">');
+					if (chart.data.labels[i]) {
+						text.push(chart.data.labels[i]);
+					}
+					text.push('</span></li>');
+				}
+			}
+
+			text.push('</ul>');
+			return text.join("");
+		}
 	};
 
 	Chart.PolarArea = function(context, config) {