Merge pull request #6687 from Alex-Grimes/fix/datepicker-changes-12am-to-12pm-on-date-selection
Fix/datepicker changes 12am to 12pm on date selectionpull/6768/head
commit
ff099dfac6
|
@ -998,7 +998,6 @@ export default {
|
|||
this.pm = currentHour > 11;
|
||||
|
||||
if (currentHour >= 12) currentHour = currentHour == 12 ? 12 : currentHour - 12;
|
||||
else currentHour = currentHour == 0 ? 12 : currentHour;
|
||||
}
|
||||
|
||||
this.currentHour = Math.floor(currentHour / this.stepHour) * this.stepHour;
|
||||
|
@ -2925,6 +2924,9 @@ export default {
|
|||
return yearPickerValues;
|
||||
},
|
||||
formattedCurrentHour() {
|
||||
if (this.currentHour == 0) {
|
||||
return this.currentHour + 12;
|
||||
}
|
||||
return this.currentHour < 10 ? '0' + this.currentHour : this.currentHour;
|
||||
},
|
||||
formattedCurrentMinute() {
|
||||
|
|
Loading…
Reference in New Issue