Fixed case when just "12" is entered. Added test for this case.

Author: Evan Taylor

src/formatters/ampm.js

@@ -354,6 +354,7 @@
                 minute,
                 format = format || 'H:i:s',
                 pm = time.match(/p/i) !== null,
+                am = time.match(/a/i) !== null,
                 num = time.replace(/[^0-9]/g, '');
 
             // Parse for hour and minute
@@ -375,10 +376,13 @@
                     return '';
             }
 
-            if(hour == 12 && pm === false){
+            // if 12 and am/pm not specified assume pm
+            if (hour == 12 && pm === false && am === false) {
+                hour = 12;
+                pm = true;
+            } else if (hour == 12 && pm === false) {
                 hour = 0;
-            }
-            else if(pm === true && hour > 0 && hour < 12){
+            } else if (pm === true && hour > 0 && hour < 12) {
                 hour += 12;
             }
 

tests/spec/formatters/ampm.spec.js

@@ -184,7 +184,10 @@ describe('formatter/ampm', function(){
                 '25:60 PM': '2:50 PM',
                 '83 PM': '8:30 PM',
                 '27 PM': '2:07 PM',
-                '33 PM': '3:30 PM'
+                '33 PM': '3:30 PM',
+                '23': '11:00 PM',
+                '00': '12:00 AM',
+                '12': '12:00 PM'
             };
 
             for(var k in re){