Merge pull request #5702 from m-meier/patch-4

fix(DatePicker): set hour on 24h mode on date select, fixes #5596
primefaces · May 16, 2024 · 57de63f · 57de63f
2 parents c3669ad + 7f7b909
commit 57de63f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/components/lib/datepicker/DatePicker.vue b/components/lib/datepicker/DatePicker.vue
@@ -1168,9 +1168,9 @@ export default {
             let date = new Date(dateMeta.year, dateMeta.month, dateMeta.day);
 
             if (this.showTime) {
-                if (this.hourFormat === '12' && this.currentHour !== 12) {
-                    this.pm ? date.setHours(this.currentHour + 12) : date.setHours(this.currentHour);
-                }
+                (this.hourFormat === '12' && this.currentHour !== 12 && this.pm) ? 
+                    date.setHours(this.currentHour + 12) : 
+                    date.setHours(this.currentHour);
 
                 date.setMinutes(this.currentMinute);
                 date.setSeconds(this.currentSecond);