Remove mergeTicksOptions (#6621)

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 849d31d35e6a682582de7088b1a73f623253bb64..27884bcf04fd749f85da6b0b168f7427204cb5ce 100644 (file)
--- 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 ed27af3f14eeb87f5b56ab4235cdf65b54e2a522..8feacb08197b2dd9f6b2bb25d7e31141876aefe8 100644 (file)
--- 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 2b82e4408d14b55293dd02a72bed04a2264583f5..4523ac9fe348732d9bf31468f3ff5650b5b06dee 100644 (file)
--- 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;