From 1471a61609cbb7dc3a024d66517d6ad9277eecce Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg@gmail.com>
Date: Thu, 19 Nov 2015 21:12:23 -0500
Subject: [PATCH 1/3] Update default tooltip callbacks for bubble charts

---
 src/charts/Chart.Bubble.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/charts/Chart.Bubble.js b/src/charts/Chart.Bubble.js
index d4715c026..a6b03c1fc 100644
--- a/src/charts/Chart.Bubble.js
+++ b/src/charts/Chart.Bubble.js
@@ -24,14 +24,24 @@
 		},
 
 		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.bubble = defaultConfig;
+
 	Chart.Bubble = function(context, config) {
-		config.options = helpers.configMerge(defaultConfig, config.options);
+		//config.options = helpers.configMerge(defaultConfig, config.options);
 		config.type = 'bubble';
 		return new Chart(context, config);
 	};

From ca2e017f805c590a696eca2a024a9dd9bf17b986 Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg@gmail.com>
Date: Thu, 19 Nov 2015 21:15:59 -0500
Subject: [PATCH 2/3] 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);
 	};
 	

From 800246660a086c34cdb020a6237b23ec54ca802f Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg@gmail.com>
Date: Thu, 19 Nov 2015 21:20:04 -0500
Subject: [PATCH 3/3] Remove commented code

---
 src/charts/Chart.Bubble.js  | 1 -
 src/charts/Chart.Scatter.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/charts/Chart.Bubble.js b/src/charts/Chart.Bubble.js
index a6b03c1fc..57346f30f 100644
--- a/src/charts/Chart.Bubble.js
+++ b/src/charts/Chart.Bubble.js
@@ -41,7 +41,6 @@
 	Chart.defaults.bubble = defaultConfig;
 
 	Chart.Bubble = function(context, config) {
-		//config.options = helpers.configMerge(defaultConfig, config.options);
 		config.type = 'bubble';
 		return new Chart(context, config);
 	};
diff --git a/src/charts/Chart.Scatter.js b/src/charts/Chart.Scatter.js
index 124cbad77..c6469b053 100644
--- a/src/charts/Chart.Scatter.js
+++ b/src/charts/Chart.Scatter.js
@@ -43,7 +43,6 @@
 	Chart.controllers.scatter = Chart.controllers.line;
 
 	Chart.Scatter = function(context, config) {
-		//config.options = helpers.configMerge(defaultConfig, config.options);
 		config.type = 'scatter';
 		return new Chart(context, config);
 	};