github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 14:12:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: adds support for seconds in local-dates (#6339)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-08-30 12:38:05 +02:00
committed by GitHub
parent d40d241e72
commit 3ed9533066
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
View File

@ -13,7 +13,7 @@
var relativeTime = moment.utc(
options.date + " " + options.time,
"YYYY-MM-DD HH:mm"
"YYYY-MM-DD HH:mm:ss"
);
if (options.recurring && relativeTime < moment().utc()) {
@ -43,7 +43,13 @@
});
var relativeTime = relativeTime.tz(moment.tz.guess());
if (moment(relativeTime).isSame(moment(), "day")) {
if (
options.format !== "YYYY-MM-DD HH:mm:ss" &&
relativeTime.isBetween(
moment().subtract(1, "day"),
moment().add(2, "day")
)
) {
relativeTime = relativeTime.calendar();
} else {
relativeTime = relativeTime.format(options.format);