Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

timerender: Extract func to calculate days_old from time.

This commit is contained in:
Aman Agrawal 2020-10-02 15:15:22 +05:30 committed by Tim Abbott
parent c7d66421f9
commit d3f4f64b0e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
static/js/timerender.js
View File

@ -9,6 +9,15 @@ const set_to_start_of_day = function (time) {
return time.setMilliseconds(0).setSeconds(0).setMinutes(0).setHours(0); return time.setMilliseconds(0).setSeconds(0).setMinutes(0).setHours(0);
}; };
function calculate_days_old_from_time(time, today) {
const start_of_today = set_to_start_of_day(today ? today.clone() : new XDate());
const start_of_other_day = set_to_start_of_day(time.clone());
const days_old = Math.round(start_of_other_day.diffDays(start_of_today));
const is_older_year = start_of_today.getFullYear() - start_of_other_day.getFullYear() > 0;
return {days_old, is_older_year};
}
// Given an XDate object 'time', returns an object: // Given an XDate object 'time', returns an object:
// { // {
// time_str: a string for the current human-formatted version // time_str: a string for the current human-formatted version
@ -18,9 +27,6 @@ const set_to_start_of_day = function (time) {
// day changes // day changes
// } // }
exports.render_now = function (time, today) { exports.render_now = function (time, today) {
const start_of_today = set_to_start_of_day(today || new XDate());
const start_of_other_day = set_to_start_of_day(time.clone());
let time_str = ""; let time_str = "";
let needs_update = false; let needs_update = false;
// render formal time to be used as title attr tooltip // render formal time to be used as title attr tooltip
@ -34,9 +40,7 @@ exports.render_now = function (time, today) {
// Presumably the result of diffDays will be an integer in this // Presumably the result of diffDays will be an integer in this
// case, but round it to be sure before comparing to integer // case, but round it to be sure before comparing to integer
// constants. // constants.
const days_old = Math.round(start_of_other_day.diffDays(start_of_today)); const {days_old, is_older_year} = calculate_days_old_from_time(time, today);
const is_older_year = start_of_today.getFullYear() - start_of_other_day.getFullYear() > 0;
if (days_old === 0) { if (days_old === 0) {
time_str = i18n.t("Today"); time_str = i18n.t("Today");