matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Add 12 hour class to mx_EventTile

Browse Source
This commit is contained in:
Kieran Gould
2017-05-19 22:26:24 +01:00
parent f9152b205c
commit 6b32975e0c
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/DateUtils.js
View File

@@ -25,10 +25,9 @@ function pad(n) {
function twelveHourTime(date) {
let hours = date.getHours() % 12;
let minutes = pad(date.getMinutes());
const minutes = pad(date.getMinutes());
const ampm = hours >= 12 ? 'PM' : 'AM';
hours = pad(hours ? hours : 12);
minutes = pad(minutes);
return `${hours}:${minutes} ${ampm}`;
}
@@ -44,9 +43,7 @@ module.exports = {
else if (now.getFullYear() === date.getFullYear()) {
return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + this.formatTime(date);
}
else {
return this.formatFullDate(date);
}
return this.formatFullDate(date);
},
formatFullDate: function(date) {