Remove deprecated userCallback (#6638)

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 8feacb08197b2dd9f6b2bb25d7e31141876aefe8..20e13953fb906259e32ae9611eee88e1c35bf024 100644 (file)
--- 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 b26456c6aa6b2e8278e8d1daeddeef4116a14926..cb3aac10acc1d0765301727c9e8f3b307ada88e9 100644 (file)
--- 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;