From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 29 Oct 2019 21:22:11 +0000 (-0700)
Subject: Remove deprecated userCallback (#6638)
X-Git-Tag: v3.0.0-alpha~284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=994fe712deaaea62fd46bc86e411723efd3cd165;p=thirdparty%2FChart.js.git

Remove deprecated userCallback (#6638)
---

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 8feacb081..20e13953f 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -571,7 +571,7 @@ var Scale = Element.extend({
 		var me = this;
 		// Convert ticks to strings
 		var tickOpts = me.options.ticks;
-		me.ticks = me.ticks.map(tickOpts.userCallback || tickOpts.callback, this);
+		me.ticks = me.ticks.map(tickOpts.callback, this);
 	},
 	afterTickToLabelConversion: function() {
 		helpers.callback(this.options.afterTickToLabelConversion, [this]);
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index b26456c6a..cb3aac10a 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -615,9 +615,7 @@ module.exports = Scale.extend({
 		var nestedTickOpts = major ? tickOpts.major : tickOpts.minor;
 		var formatter = resolve([
 			nestedTickOpts.callback,
-			nestedTickOpts.userCallback,
-			tickOpts.callback,
-			tickOpts.userCallback
+			tickOpts.callback
 		]);
 
 		return formatter ? formatter(label, index, ticks) : label;