From 4d69119d18df7a8dc4250ae9dc25660e74c8a07e Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sun, 27 Oct 2019 15:12:05 -0700 Subject: [PATCH] Remove mergeTicksOptions (#6621) --- src/core/core.controller.js | 2 -- src/core/core.scale.js | 10 ---------- src/scales/scale.time.js | 4 ---- 3 files changed, 16 deletions(-) diff --git a/src/core/core.controller.js b/src/core/core.controller.js index 849d31d35..27884bcf0 100644 --- a/src/core/core.controller.js +++ b/src/core/core.controller.js @@ -393,8 +393,6 @@ helpers.extend(Chart.prototype, /** @lends Chart */ { scales[scale.id] = scale; } - scale.mergeTicksOptions(); - // TODO(SB): I think we should be able to remove this custom case (options.scale) // and consider it as a regular scale part of the "scales"" map only! This would // make the logic easier and remove some useless? custom code. diff --git a/src/core/core.scale.js b/src/core/core.scale.js index ed27af3f1..8feacb081 100644 --- a/src/core/core.scale.js +++ b/src/core/core.scale.js @@ -363,16 +363,6 @@ var Scale = Element.extend({ // Any function defined here is inherited by all scale types. // Any function can be extended by the scale type - /** - * Provided for backward compatibility, not available anymore - * @function Chart.Scale.mergeTicksOptions - * @deprecated since version 2.8.0 - * @todo remove at version 3 - */ - mergeTicksOptions: function() { - // noop - }, - beforeUpdate: function() { helpers.callback(this.options.beforeUpdate, [this]); }, diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 2b82e4408..4523ac9fe 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -441,10 +441,6 @@ var defaultConfig = { }; module.exports = Scale.extend({ - initialize: function() { - this.mergeTicksOptions(); - Scale.prototype.initialize.call(this); - }, update: function() { var me = this; -- 2.47.2