Built legend version

This commit is contained in:
Evert Timberg 2015-07-05 14:56:35 -04:00
parent 925e305184
commit f3eb6f4a43
2 changed files with 18 additions and 10 deletions

20
Chart.js vendored
View File

@ -83,8 +83,10 @@
defaultColor: 'rgba(0,0,0,0.1)',
// Element defaults defined in element extensions
elements: {}
elements: {},
// Legend template string
legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i = 0; i < data.datasets.length; i++){%><li><span style=\"background-color:<%=data.datasets[i].backgroundColor%>\"><%if(data.datasets[i].label){%><%=data.datasets[i].label%><%}%></span></li><%}%></ul>",
},
};
@ -1520,7 +1522,7 @@
},
generateLegend: function generateLegend() {
return template(this.options.legendTemplate, this);
return helpers.template(this.options.legendTemplate, this);
},
destroy: function destroy() {
@ -3132,7 +3134,6 @@
var easingDecimal = ease || 1;
helpers.each(this.getDataset().metaData, function(arc, index) {
arc.transition(easingDecimal).draw();
console.log(arc);
}, this);
},
@ -5228,7 +5229,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);
@ -5258,7 +5264,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.PolarArea = function(context, config) {
config.options = helpers.configMerge(defaultConfig, config.options);
config.type = 'polarArea';
return new Chart(context, config);
@ -5306,9 +5317,6 @@
}],
},
//String - A legend template
legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].borderColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>",
tooltips: {
template: "(<%= value.x %>, <%= value.y %>)",
multiTemplate: "<%if (datasetLabel){%><%=datasetLabel%>: <%}%>(<%= value.x %>, <%= value.y %>)",

8
Chart.min.js vendored

File diff suppressed because one or more lines are too long