github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 12:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

properly account for future/past dates when humanizing with moment

Browse source
This commit is contained in:
Drewster727 2016-04-05 13:49:05 -05:00
commit 4c82f4d821
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PlexRequests.UI/Content/requests.js
View file

@ -527,11 +527,11 @@ function buildRequestContext(result, type) {
year: result.releaseYear, year: result.releaseYear,
type: type, type: type,
status: result.status, status: result.status,
releaseDate: moment.duration(moment() - moment(result.releaseDate).local()).humanize() + ' ago', releaseDate: Humanize(result.releaseDate),
releaseDateTicks: result.releaseDateTicks, releaseDateTicks: result.releaseDateTicks,
approved: result.approved, approved: result.approved,
requestedUsers: result.requestedUsers ? result.requestedUsers.join(', ') : '', requestedUsers: result.requestedUsers ? result.requestedUsers.join(', ') : '',
requestedDate: moment.duration(moment() - moment(result.requestedDate).local()).humanize() + ' ago', requestedDate: Humanize(result.requestedDate),
requestedDateTicks: result.requestedDateTicks, requestedDateTicks: result.requestedDateTicks,
available: result.available, available: result.available,
admin: result.admin, admin: result.admin,

6
PlexRequests.UI/Content/site.js
View file

@ -8,6 +8,12 @@
return s; return s;
} }
function Humanize(date) {
var mNow = moment();
var mDate = moment(date).local();
return moment.duration(mNow - mDate).humanize() + (mNow.isBefore(mDate) ? ' from now' : ' ago');
}
function generateNotify(message, type) { function generateNotify(message, type) {
// type = danger, warning, info, successs // type = danger, warning, info, successs
$.notify({ $.notify({