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

FEATURE: Show relative time when date is omitted (#18547)

Browse Source
This commit is contained in:
Natalie Tay
2022-10-12 11:23:34 +08:00
committed by GitHub
parent 84f2529138
commit 1631394826
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js
View File

@ -67,12 +67,12 @@ export default class LocalDateBuilder {
}
const previews = this._generatePreviews(localDate, displayedTimezone);
const hasTime = hour !== undefined;
return {
pastEvent:
!this.recurring &&
moment.tz(this.localTimezone).isAfter(localDate.datetime),
formatted: this._applyFormatting(localDate, displayedTimezone),
formatted: this._applyFormatting(localDate, displayedTimezone, hasTime),
previews,
textPreview: this._generateTextPreviews(previews),
};
@ -210,7 +210,7 @@ export default class LocalDateBuilder {
return duration < 0 ? dates.reverse() : dates;
}
_applyFormatting(localDate, displayedTimezone) {
_applyFormatting(localDate, displayedTimezone, hasTime) {
if (this.countdown) {
const diffTime = moment.tz(this.localTimezone).diff(localDate.datetime);
@ -241,7 +241,7 @@ export default class LocalDateBuilder {
if (inCalendarRange && sameTimezone) {
const date = localDate.datetimeWithZone(this.localTimezone);
if (date.hours() === 0 && date.minutes() === 0) {
if (hasTime && date.hours() === 0 && date.minutes() === 0) {
return date.format("dddd");
}