imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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) {