From: Evert Timberg <evert.timberg@gmail.com>
Date: Sun, 5 Jul 2015 18:56:22 +0000 (-0400)
Subject: Doughnut legends (only makes sense for first dataset).
X-Git-Tag: 2.0.0-alpha4~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=925e3051846572d553c3eed89e95a5db8f3c9fae;p=thirdparty%2FChart.js.git

Doughnut legends (only makes sense for first dataset).
---

diff --git a/samples/doughnut.html b/samples/doughnut.html
index f2c4282f8..ae6bbc9e5 100644
--- a/samples/doughnut.html
+++ b/samples/doughnut.html
@@ -26,6 +26,12 @@
     <button id="removeDataset">Remove Dataset</button>
     <button id="addData">Add Data</button>
     <button id="removeData">Remove Data</button>
+    <div>
+        <h3>Legend</h3>
+        <div id="legendContainer">
+            
+        </div>
+    </div>
     <script>
     var randomScalingFactor = function() {
         return Math.round(Math.random() * 100);
@@ -38,7 +44,6 @@
     };
 
     var config = {
-        type: 'doughnut',
         data: {
             datasets: [{
                 data: [
@@ -99,10 +104,18 @@
         }
     };
 
+    function updateLegend() {
+        $legendContainer = $('#legendContainer');
+        $legendContainer.empty();
+        $legendContainer.append(window.myDoughnut.generateLegend());
+    }
+
     window.onload = function() {
         var ctx = document.getElementById("chart-area").getContext("2d");
-        window.myDoughnut = new Chart(ctx, config);
+        window.myDoughnut = Chart.Doughnut(ctx, config);
         console.log(window.myDoughnut);
+
+        updateLegend();
     };
 
     $('#randomizeData').click(function() {
@@ -117,6 +130,7 @@
         });
 
         window.myDoughnut.update();
+        updateLegend();
     });
 
     $('#addDataset').click(function() {
@@ -131,6 +145,7 @@
         }
 
         window.myDoughnut.addDataset(newDataset);
+        updateLegend();
     });
 
     $('#addData').click(function() {
@@ -140,11 +155,14 @@
             $.each(config.data.datasets, function(index, dataset) {
                 window.myDoughnut.addData(randomScalingFactor(), index, dataset.data.length, randomColor(0.7));
             });
+
+            updateLegend();
         }
     });
 
     $('#removeDataset').click(function() {
         window.myDoughnut.removeDataset(0);
+        updateLegend();
     });
 
     $('#removeData').click(function() {
@@ -153,6 +171,8 @@
         config.data.datasets.forEach(function(dataset, datasetIndex) {
             window.myDoughnut.removeData(datasetIndex, -1);
         });
+
+        updateLegend();
     });
     </script>
 </body>
diff --git a/src/charts/Chart.Doughnut.js b/src/charts/Chart.Doughnut.js
index d01959d44..ccea714f3 100644
--- a/src/charts/Chart.Doughnut.js
+++ b/src/charts/Chart.Doughnut.js
@@ -5,7 +5,12 @@
 	var Chart = root.Chart;
 	var helpers = Chart.helpers;
 
+	var defaultConfig = {
+		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>",
+	};
+
 	Chart.Doughnut = function(context, config) {
+		config.options = helpers.configMerge(defaultConfig, config.options);
 		config.type = 'doughnut';
 
 		return new Chart(context, config);