diff --git a/samples/bar.html b/samples/bar.html index 1d085208e..eb8796ac5 100644 --- a/samples/bar.html +++ b/samples/bar.html @@ -16,6 +16,12 @@ +
+

Legend

+
+ +
+
diff --git a/samples/line.html b/samples/line.html index edcca91ec..28171cdea 100644 --- a/samples/line.html +++ b/samples/line.html @@ -23,6 +23,12 @@ +
+

Legend

+
+ +
+
diff --git a/samples/radar.html b/samples/radar.html index 0605c76e7..b84b84583 100644 --- a/samples/radar.html +++ b/samples/radar.html @@ -16,6 +16,12 @@ + ]
+

Legend

+
+ +
+
diff --git a/src/charts/Chart.Scatter.js b/src/charts/Chart.Scatter.js index 3c784ff32..8863ed5e6 100644 --- a/src/charts/Chart.Scatter.js +++ b/src/charts/Chart.Scatter.js @@ -23,9 +23,6 @@ }], }, - //String - A legend template - legendTemplate: "", - tooltips: { template: "(<%= value.x %>, <%= value.y %>)", multiTemplate: "<%if (datasetLabel){%><%=datasetLabel%>: <%}%>(<%= value.x %>, <%= value.y %>)", diff --git a/src/core/core.controller.js b/src/core/core.controller.js index c7e29dcd3..bd843631b 100644 --- a/src/core/core.controller.js +++ b/src/core/core.controller.js @@ -338,7 +338,7 @@ }, generateLegend: function generateLegend() { - return template(this.options.legendTemplate, this); + return helpers.template(this.options.legendTemplate, this); }, destroy: function destroy() { diff --git a/src/core/core.js b/src/core/core.js index 85a991671..42c214e14 100755 --- a/src/core/core.js +++ b/src/core/core.js @@ -83,8 +83,10 @@ defaultColor: 'rgba(0,0,0,0.1)', // Element defaults defined in element extensions - elements: {} + elements: {}, + // Legend template string + legendTemplate: "", }, };