Skip to content

Commit

Permalink
Format the label in the time scale tooltip
Browse files Browse the repository at this point in the history
  • Loading branch information
benmccann committed Jan 7, 2018
1 parent 92d033b commit ccc2f5b
Showing 1 changed file with 29 additions and 3 deletions.
32 changes: 29 additions & 3 deletions src/scales/scale.time.js
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,31 @@ function ticksFromTimestamps(values, majorUnit) {
return ticks;
}

function determineLabelFormat(data, timeOpts) {
var i, momentDate, hasTime;
var ilen = data.length;

if (timeOpts.tooltipFormat) {
return timeOpts.tooltipFormat;
}

// find the label with the most parts (milliseconds, minutes, etc.)
// format all labels with the same level of detail as the most specific label
for (i = 0; i < ilen; i++) {
momentDate = momentify(data[i], timeOpts);
if (momentDate.millisecond() !== 0) {
return 'MMM D, YYYY h:mm:ss.SSS a';
}
if (momentDate.second() !== 0 || momentDate.minute() !== 0 || momentDate.hour() !== 0) {
hasTime = true;
}
}
if (hasTime) {
return 'MMM D, YYYY h:mm:ss a';
}
return 'MMM D, YYYY';
}

module.exports = function(Chart) {

var defaultConfig = {
Expand Down Expand Up @@ -621,6 +646,7 @@ module.exports = function(Chart) {
me._majorUnit = determineMajorUnit(me._unit);
me._table = buildLookupTable(me._timestamps.data, min, max, options.distribution);
me._offsets = computeOffsets(me._table, ticks, min, max, options);
me._labelFormat = determineLabelFormat(me._timestamps.data, timeOpts);

return ticksFromTimestamps(ticks, me._majorUnit);
},
Expand All @@ -635,11 +661,11 @@ module.exports = function(Chart) {
if (helpers.isObject(value)) {
label = me.getRightValue(value);
}
if (timeOpts.tooltipFormat) {
label = momentify(label, timeOpts).format(timeOpts.tooltipFormat);
if (typeof label === 'string') {
return label;
}

return label;
return momentify(label, timeOpts).format(me._labelFormat);
},

/**
Expand Down

0 comments on commit ccc2f5b

Please sign in to comment.