Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 12:19:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated userCallback (#6638)

Browse Source
This commit is contained in:
Ben McCann 2019-10-29 14:22:11 -07:00 committed by Evert Timberg
parent 46ae5814fd
commit 994fe712de
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/core.scale.js
View File

@ -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]);

4
src/scales/scale.time.js
View File

@ -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;