Bug fix #3: midnight and noon was incorrectly formatted when using 12…

…-hour clock.
dmester · May 17, 2017 · f56a6df · f56a6df
1 parent 4a6adec
commit f56a6df
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/stringformat.js b/src/stringformat.js
@@ -728,8 +728,8 @@ var sffjs = (function() {
                         // Hour
                         match == "HH"   ? numberPair(hour) :
                         match == "H"    ? hour :
-                        match == "hh"   ? numberPair((hour - 1) % 12 + 1) :
-                        match == "h"    ? (hour - 1) % 12 + 1 :
+                        match == "hh"   ? numberPair(hour % 12 || 12) :
+                        match == "h"    ? hour % 12 || 12 :
 
                         // Minute
                         match == "mm"   ? numberPair(minute) :

diff --git a/src/stringformat.tests.js b/src/stringformat.tests.js
@@ -354,7 +354,21 @@
         assert.formatsTo("4/2/1989 6:20:33 PM", "{0:G}", dtpm);
         assert.formatsTo("April 2", "{0:M}", dtpm);
         assert.formatsTo("April 2", "{0:m}", dtpm);
-
+
+        assert.formatsTo("12:30 AM", "{0:hh:mm tt}", new Date(2000, 0, 1, 00, 30, 00));
+        assert.formatsTo("01:30 AM", "{0:hh:mm tt}", new Date(2000, 0, 1, 01, 30, 00));
+        assert.formatsTo("11:30 AM", "{0:hh:mm tt}", new Date(2000, 0, 1, 11, 30, 00));
+        assert.formatsTo("12:30 PM", "{0:hh:mm tt}", new Date(2000, 0, 1, 12, 30, 00));
+        assert.formatsTo("01:30 PM", "{0:hh:mm tt}", new Date(2000, 0, 1, 13, 30, 00));
+        assert.formatsTo("11:30 PM", "{0:hh:mm tt}", new Date(2000, 0, 1, 23, 30, 00));
+
+        assert.formatsTo("12:30 AM", "{0:h:mm tt}", new Date(2000, 0, 1, 00, 30, 00));
+        assert.formatsTo("1:30 AM", "{0:h:mm tt}", new Date(2000, 0, 1, 01, 30, 00));
+        assert.formatsTo("11:30 AM", "{0:h:mm tt}", new Date(2000, 0, 1, 11, 30, 00));
+        assert.formatsTo("12:30 PM", "{0:h:mm tt}", new Date(2000, 0, 1, 12, 30, 00));
+        assert.formatsTo("1:30 PM", "{0:h:mm tt}", new Date(2000, 0, 1, 13, 30, 00));
+        assert.formatsTo("11:30 PM", "{0:h:mm tt}", new Date(2000, 0, 1, 23, 30, 00));
+
         test.section("Quoted text");
         assert.formatsTo("06mm33", "{0:hh'mm'ss}", dtam);
         assert.formatsTo("06mm33", "{0:hh\"mm\"ss}", dtam);