Fixed #5596 - Calendar: Hours are set to 00 when clicking the "Today" button

When the "Today" button is clicked, the hours field is set to 00 instead of the current hour. The minutes field is populated correctly.
pull/5607/head
thristov78 2024-04-17 18:14:36 +03:00 committed by GitHub
parent 6615f31d8a
commit f5578a46de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions

View File

@ -1162,9 +1162,9 @@ export default {
let date = new Date(dateMeta.year, dateMeta.month, dateMeta.day); let date = new Date(dateMeta.year, dateMeta.month, dateMeta.day);
if (this.showTime) { if (this.showTime) {
if (this.hourFormat === '12' && this.currentHour !== 12) { (this.hourFormat === '12' && this.currentHour !== 12 && this.pm) ?
this.pm ? date.setHours(this.currentHour + 12) : date.setHours(this.currentHour); date.setHours(this.currentHour + 12) :
} date.setHours(this.currentHour);
date.setMinutes(this.currentMinute); date.setMinutes(this.currentMinute);
date.setSeconds(this.currentSecond); date.setSeconds(this.currentSecond);