From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sun, 25 Sep 2016 12:30:39 +0000 (-0400)
Subject: Fixes HTML legend string for polar area charts to match doughnut charts. (#3361)
X-Git-Tag: v2.4.0~1^2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3d9573af5e8410cb456c86857cd58983e4b1ba8;p=thirdparty%2FChart.js.git

Fixes HTML legend string for polar area charts to match doughnut charts. (#3361)

Fixes HTML legend string for polar area charts to match doughnut charts
---

diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index b27daf417..78234ea59 100644
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -32,11 +32,11 @@ module.exports = function(Chart) {
 
 			if (datasets.length) {
 				for (var i = 0; i < datasets[0].data.length; ++i) {
-					text.push('<li><span style="background-color:' + datasets[0].backgroundColor[i] + '">');
+					text.push('<li><span style="background-color:' + datasets[0].backgroundColor[i] + '"></span>');
 					if (labels[i]) {
 						text.push(labels[i]);
 					}
-					text.push('</span></li>');
+					text.push('</li>');
 				}
 			}
 
diff --git a/test/defaultConfig.tests.js b/test/defaultConfig.tests.js
index fb34d33ec..84c9655e6 100644
--- a/test/defaultConfig.tests.js
+++ b/test/defaultConfig.tests.js
@@ -219,7 +219,7 @@ describe("Default Configs", function() {
 				options: config
 			});
 
-			var expectedLegend = '<ul class="' + chart.id + '-legend"><li><span style="background-color:red">label1</span></li><li><span style="background-color:green">label2</span></li></ul>';
+			var expectedLegend = '<ul class="' + chart.id + '-legend"><li><span style="background-color:red"></span>label1</li><li><span style="background-color:green"></span>label2</li></ul>';
 			expect(chart.generateLegend()).toBe(expectedLegend);
 		});