From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Thu, 14 Nov 2019 00:04:56 +0000 (+0200)
Subject: Small chores (#6740)
X-Git-Tag: v3.0.0-alpha~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4feaea925fe0748b364a5313d52a06200c9b2477;p=thirdparty%2FChart.js.git

Small chores (#6740)

* Remove duplicate code
* Migrate `xLabel` and `yLabel` from docs & samples
---

diff --git a/docs/configuration/tooltip.md b/docs/configuration/tooltip.md
index 8ef57bbd6..7ffefd93d 100644
--- a/docs/configuration/tooltip.md
+++ b/docs/configuration/tooltip.md
@@ -136,7 +136,7 @@ var chart = new Chart(ctx, {
                     if (label) {
                         label += ': ';
                     }
-                    label += Math.round(tooltipItem.yLabel * 100) / 100;
+                    label += Math.round(tooltipItem.value * 100) / 100;
                     return label;
                 }
             }
diff --git a/samples/tooltips/custom-points.html b/samples/tooltips/custom-points.html
index 403d22e4e..d65aa77be 100644
--- a/samples/tooltips/custom-points.html
+++ b/samples/tooltips/custom-points.html
@@ -57,7 +57,7 @@
 
 			if (tooltip.dataPoints.length > 0) {
 				tooltip.dataPoints.forEach(function(dataPoint) {
-					var content = [dataPoint.xLabel, dataPoint.yLabel].join(': ');
+					var content = [dataPoint.label, dataPoint.value].join(': ');
 					var $tooltip = $('#tooltip-' + dataPoint.datasetIndex);
 
 					$tooltip.html(content);
diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index 1c9d3d91e..1bf406fec 100644
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -15,13 +15,6 @@ module.exports = Scale.extend({
 		return first === -1 || first !== last ? index : first;
 	},
 
-	_parseObject: function(obj, axis, index) {
-		if (obj[axis] !== undefined) {
-			return this._parse(obj[axis], index);
-		}
-		return null;
-	},
-
 	determineDataLimits: function() {
 		var me = this;
 		var max = me._getLabels().length - 1;