Fixed #5108 - Calendar: 12h time picker changes from 12 am to 12 pm automatically
parent
b2bc41fcda
commit
87c94406a7
|
@ -1155,8 +1155,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.pm && this.currentHour != 12) date.setHours(this.currentHour + 12);
|
if (this.hourFormat === '12' && this.currentHour !== 12) {
|
||||||
else date.setHours(this.currentHour);
|
this.pm ? 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