mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-26 19:26:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #969 from turt2live/travis/12h-ts-collision

Browse source 
Remove space between time and AM/PM
This commit is contained in:
Matthew Hodgson 2017-05-30 17:23:04 +01:00 committed by GitHub
commit 9975514850
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/DateUtils.js
View file

@ -56,7 +56,7 @@ function twelveHourTime(date) {
const minutes = pad(date.getMinutes());
const ampm = date.getHours() >= 12 ? 'PM' : 'AM';
hours = pad(hours ? hours : 12);
return `${hours}:${minutes} ${ampm}`;
return `${hours}:${minutes}${ampm}`;
}
module.exports = {