diff options
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | core/js/js.js | 53 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 2 | ||||
| -rw-r--r-- | settings/js/users/users.js | 5 |
4 files changed, 30 insertions, 32 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 3cbc25fc24b..fd11a80248d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -703,7 +703,7 @@ "class": "modified", "title": formatDate(mtime), "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')' - }).text( relative_modified_date(mtime / 1000) )); + }).text(OC.Util.relativeModifiedDate(mtime))); tr.find('.filesize').text(simpleSize); tr.append(td); return tr; diff --git a/core/js/js.js b/core/js/js.js index 60f9cc11a58..2b3107ecbbf 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -390,11 +390,6 @@ var OC={ } }, 500), dialogs:OCdialogs, - mtime2date:function(mtime) { - mtime = parseInt(mtime,10); - var date = new Date(1000*mtime); - return date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes(); - }, /** * Parses a URL query string into a JS map @@ -1242,14 +1237,11 @@ function humanFileSize(size, skipSmallSizes) { /** * Format an UNIX timestamp to a human understandable format - * @param {number} date UNIX timestamp + * @param {number} timestamp UNIX timestamp * @return {string} Human readable format */ -function formatDate(date){ - if(typeof date=='number'){ - date=new Date(date); - } - return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes(); +function formatDate(timestamp){ + return OC.Util.formatDate(timestamp); } // @@ -1270,21 +1262,11 @@ function getURLParameter(name) { * @param {number} timestamp A Unix timestamp */ function relative_modified_date(timestamp) { - var timeDiff = Math.round((new Date()).getTime() / 1000) - timestamp; - var diffMinutes = Math.round(timeDiff/60); - var diffHours = Math.round(diffMinutes/60); - var diffDays = Math.round(diffHours/24); - var diffMonths = Math.round(diffDays/31); - if(timeDiff < 60) { return t('core','seconds ago'); } - else if(timeDiff < 3600) { return n('core','%n minute ago', '%n minutes ago', diffMinutes); } - else if(timeDiff < 86400) { return n('core', '%n hour ago', '%n hours ago', diffHours); } - else if(timeDiff < 86400) { return t('core','today'); } - else if(timeDiff < 172800) { return t('core','yesterday'); } - else if(timeDiff < 2678400) { return n('core', '%n day ago', '%n days ago', diffDays); } - else if(timeDiff < 5184000) { return t('core','last month'); } - else if(timeDiff < 31556926) { return n('core', '%n month ago', '%n months ago', diffMonths); } - else if(timeDiff < 63113852) { return t('core','last year'); } - else { return t('core','years ago'); } + /* + Were multiplying by 1000 to bring the timestamp back to its original value + per https://github.com/owncloud/core/pull/10647#discussion_r16790315 + */ + return OC.Util.relativeModifiedDate(timestamp * 1000); } /** @@ -1293,7 +1275,24 @@ function relative_modified_date(timestamp) { OC.Util = { // TODO: remove original functions from global namespace humanFileSize: humanFileSize, - formatDate: formatDate, + + /** + * @param timestamp + * @param format + * @returns {string} timestamp formatted as requested + */ + formatDate: function (timestamp, format) { + format = format || "MMMM D, YYYY h:mm"; + return moment(timestamp).format(format); + }, + + /** + * @param timestamp + * @returns {string} human readable difference from now + */ + relativeModifiedDate: function (timestamp) { + return moment(timestamp).fromNow(); + }, /** * Returns whether the browser supports SVG * @return {boolean} true if the browser supports SVG, false otherwise diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 7f87e1a6f3e..bd6fd2e5007 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -635,7 +635,7 @@ var OCdialogs = { type: entry.type, dir: dir, filename: entry.name, - date: relative_modified_date(entry.mtime/1000) + date: OC.Util.relativeModifiedDate(entry.mtime) }); if (entry.isPreviewAvailable) { var urlSpec = { diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 60948bb99f3..0f72746ee83 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -96,9 +96,8 @@ var UserList = { var lastLoginRel = t('settings', 'never'); var lastLoginAbs = lastLoginRel; if(lastLogin !== 0) { - lastLogin = new Date(lastLogin * 1000); - lastLoginRel = relative_modified_date(lastLogin.getTime() / 1000); - lastLoginAbs = formatDate(lastLogin.getTime()); + lastLoginRel = OC.Util.relativeModifiedDate(lastLogin); + lastLoginAbs = OC.Util.formatDate(lastLogin); } var $tdLastLogin = $tr.find('td.lastLogin'); $tdLastLogin.text(lastLoginRel); |