matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-12-01 09:58:03 +03:00
Code Activity

Fix overzealous code deletion

Browse Source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston
2017-06-30 09:29:40 -06:00
committed by GitHub
parent 01b7d7bb7c
commit e058dd58e5
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/DateUtils.js
View File

@@ -55,6 +55,7 @@ function twelveHourTime(date) {
let hours = date.getHours() % 12; let hours = date.getHours() % 12;
const minutes = pad(date.getMinutes()); const minutes = pad(date.getMinutes());
const ampm = date.getHours() >= 12 ? 'PM' : 'AM'; const ampm = date.getHours() >= 12 ? 'PM' : 'AM';
hours = hours ? hours : 12; // convert 0 -> 12
return `${hours}:${minutes}${ampm}`; return `${hours}:${minutes}${ampm}`;
} }