Fixed 12:00 am bug

The string '12:00 am' was being parsed as 12:00 pm.  I fixed that and
added a test.

diff --git a/moment.js b/moment.js
index 9565ed16bb938c9a2c8fa68a86c20772191d52c1..47aa3f7a790352bc5853afbb8a26ac74a9f183ce 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -261,6 +261,10 @@
         if (isPm && inArray[3] < 12) {
             inArray[3] += 12;
         }
+        // if is 12 am, change hours to 0
+        if (! isPm && inArray[3] === 12) {
+            inArray[3] = 0;
+        }
         return dateFromArray(inArray);
     }
 

diff --git a/sitesrc/js/unit-tests.js b/sitesrc/js/unit-tests.js
index cde923216d4af21d879210e85c118fa5067894c4..2f2c40ebb521a37659ca60894422c29723353732 100755 (executable)
--- a/sitesrc/js/unit-tests.js
+++ b/sitesrc/js/unit-tests.js
@@ -71,6 +71,8 @@ test("string with format", 13, function() {
             ['DD-MM-YYYY h:m:s',    '12-02-1999 2:45:10'],
             ['DD-MM-YYYY h:m:s a',  '12-02-1999 2:45:10 am'],
             ['DD-MM-YYYY h:m:s a',  '12-02-1999 2:45:10 pm'],
+            ['h:mm a',              '12:00 pm'],
+            ['h:mm a',              '12:00 am'],
             ['YYYY-MM-DDTHH:mm:ss', '2011-11-11T11:11:11'],
             ['MM-DD-YYYY \\M',          '12-02-1999 M']
         ],