mirror of
https://github.com/chartjs/Chart.js.git
synced 2026-03-21 23:56:52 +01:00
Remove mergeTicksOptions (#6621)
This commit is contained in:
committed by
Evert Timberg
parent
5b0a0b039c
commit
4d69119d18
@@ -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.
|
||||
|
||||
@@ -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]);
|
||||
},
|
||||
|
||||
@@ -441,10 +441,6 @@ var defaultConfig = {
|
||||
};
|
||||
|
||||
module.exports = Scale.extend({
|
||||
initialize: function() {
|
||||
this.mergeTicksOptions();
|
||||
Scale.prototype.initialize.call(this);
|
||||
},
|
||||
|
||||
update: function() {
|
||||
var me = this;
|
||||
|
||||
Reference in New Issue
Block a user