github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 23:56:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: displays "today" if event is... today (#6336)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-08-30 11:25:36 +02:00
committed by GitHub
parent f39c38d281
commit 5afb09ebbe
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,12 @@
} }
}); });
relativeTime = relativeTime.tz(moment.tz.guess()).format(options.format); var relativeTime = relativeTime.tz(moment.tz.guess());
if (moment(relativeTime).isSame(moment(), "day")) {
relativeTime = relativeTime.calendar();
} else {
relativeTime = relativeTime.format(options.format);
}
var html = "<span>"; var html = "<span>";
html += "<i class='fa fa-globe d-icon d-icon-globe'></i>"; html += "<i class='fa fa-globe d-icon d-icon-globe'></i>";