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
parent
6615f31d8a
commit
f5578a46de
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue