jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

make prettyDate work for more than 30 days

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-07-09 13:06:59 -07:00
parent 7b7e3b5950
commit 5deadbfdc7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webadmin/src/js/index.js
View File

@@ -194,7 +194,7 @@ app.filter('prettyDate', function () {
diff = (((new Date()).getTime() - date.getTime()) / 1000) + 30, // add 30seconds for clock skew
day_diff = Math.floor(diff / 86400);
if (isNaN(day_diff) || day_diff < 0 || day_diff >= 31)
if (isNaN(day_diff) || day_diff < 0)
return;
return day_diff === 0 && (
@@ -205,7 +205,9 @@ app.filter('prettyDate', function () {
diff < 86400 && Math.floor( diff / 3600 ) + ' hours ago') ||
day_diff === 1 && 'Yesterday' ||
day_diff < 7 && day_diff + ' days ago' ||
day_diff < 31 && Math.ceil( day_diff / 7 ) + ' weeks ago';
day_diff < 31 && Math.ceil( day_diff / 7 ) + ' weeks ago' ||
day_diff < 365 && Math.round( day_diff / 30 ) + ' months ago' ||
Math.round( day_diff / 365 ) + ' years ago';
};
});