Fixed primefaces#7799 typing 1200AM to 1259AM into calendar input sav…

…es as PM
RLijewski · Jul 17, 2019 · d76d575 · d76d575
1 parent e2f4a13
commit d76d575
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/app/components/calendar/calendar.ts b/src/app/components/calendar/calendar.ts
@@ -1859,8 +1859,13 @@ export class Calendar implements OnInit,OnDestroy,ControlValueAccessor {
             throw "Invalid time";
         }
         else {
-            if (this.hourFormat == '12' && h !== 12 && this.pm) {
-                h+= 12;
+            if (this.hourFormat == '12') {
+                if (h !== 12 && this.pm) {
+                    h += 12;
+                }
+                else if (!this.pm && h === 12) {
+                    h -= 12;
+                }
             }
 
             return {hour: h, minute: m, second: s};