From ca2e017f805c590a696eca2a024a9dd9bf17b986 Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Thu, 19 Nov 2015 21:15:59 -0500 Subject: [PATCH] Update default tooltip configs for scatter charts. Made scatter charts a first class chart type. --- src/charts/Chart.Scatter.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/charts/Chart.Scatter.js b/src/charts/Chart.Scatter.js index ee1ec474a..124cbad77 100644 --- a/src/charts/Chart.Scatter.js +++ b/src/charts/Chart.Scatter.js @@ -24,15 +24,27 @@ }, tooltips: { - template: "(<%= value.x %>, <%= value.y %>)", - multiTemplate: "<%if (datasetLabel){%><%=datasetLabel%>: <%}%>(<%= value.x %>, <%= value.y %>)", + callbacks: { + title: function(tooltipItems, data) { + // Title doesn't make sense for scatter since we format the data as a point + return ''; + }, + label: function(tooltipItem, data) { + return '(' + tooltipItem.xLabel + ', ' + tooltipItem.yLabel + ')'; + } + } }, - }; + // Register the default config for this type + Chart.defaults.scatter = defaultConfig; + + // Scatter charts use line controllers + Chart.controllers.scatter = Chart.controllers.line; + Chart.Scatter = function(context, config) { - config.options = helpers.configMerge(defaultConfig, config.options); - config.type = 'line'; + //config.options = helpers.configMerge(defaultConfig, config.options); + config.type = 'scatter'; return new Chart(context, config); }; -- 2.47.3