vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Merge branch 'v4' of https://github.com/primefaces/primevue into v4

pull/5756/head
Mert Sincan 2024-05-16 11:50:49 +01:00
parent 98302e417e 803e9f4ea1
commit 06c5a35cf3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/lib/datepicker/DatePicker.vue
View File

@ -1155,11 +1155,11 @@ export default {
} }
if (this.isSingleSelection() && (!this.showTime || this.hideOnDateTimeSelect)) { if (this.isSingleSelection() && (!this.showTime || this.hideOnDateTimeSelect)) {
setTimeout(() => { if (this.input) {
if (this.input) { this.input.focus();
this.input.focus(); }
}
setTimeout(() => {
this.overlayVisible = false; this.overlayVisible = false;
}, 150); }, 150);
} }
@ -1168,9 +1168,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);