mirror of
https://github.com/chartjs/Chart.js.git
synced 2024-10-06 20:29:12 +02:00
Use tick.major rather than recomputing (#6265)
This commit is contained in:
parent
1686ce0aa7
commit
196274defc
@ -672,10 +672,10 @@ module.exports = Scale.extend({
|
||||
var minorFormat = formats[me._unit];
|
||||
var majorUnit = me._majorUnit;
|
||||
var majorFormat = formats[majorUnit];
|
||||
var majorTime = +adapter.startOf(time, majorUnit);
|
||||
var tick = ticks[index];
|
||||
var tickOpts = options.ticks;
|
||||
var majorTickOpts = tickOpts.major;
|
||||
var major = majorTickOpts.enabled && majorUnit && majorFormat && time === majorTime;
|
||||
var major = majorTickOpts.enabled && majorUnit && majorFormat && tick && tick.major;
|
||||
var label = adapter.format(time, format ? format : major ? majorFormat : minorFormat);
|
||||
var nestedTickOpts = major ? majorTickOpts : tickOpts.minor;
|
||||
var formatter = helpers.options.resolve([
|
||||
@ -785,7 +785,7 @@ module.exports = Scale.extend({
|
||||
|
||||
// pick the longest format (milliseconds) for guestimation
|
||||
var format = displayFormats[timeOpts.unit] || displayFormats.millisecond;
|
||||
var exampleLabel = me.tickFormatFunction(exampleTime, 0, [], format);
|
||||
var exampleLabel = me.tickFormatFunction(exampleTime, 0, ticksFromTimestamps(me, [exampleTime], me._majorUnit), format);
|
||||
var size = me._getLabelSize(exampleLabel);
|
||||
|
||||
// Using margins instead of padding because padding is not calculated
|
||||
|
Loading…
Reference in New Issue
Block a user