Merge pull request #5607 from thristov78/patch-1

Fixed #5596 - Calendar: Hours are set to 00 when clicking the "Today" button
primefaces · Apr 19, 2024 · dd71f32 · dd71f32
2 parents 63b5ca7 + f5578a4
commit dd71f32
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/components/lib/calendar/Calendar.vue b/components/lib/calendar/Calendar.vue
@@ -1162,9 +1162,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);