Set maximumSignificantDigits only when number > 0 to avoid format err…

…ors on HTC Browser. Fixes #96.
jsmreese · Jan 19, 2018 · 9e6c6df · 9e6c6df
1 parent 6f3a82c
commit 9e6c6df
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/moment-duration-format.js b/lib/moment-duration-format.js
@@ -185,7 +185,9 @@
                 localeStringOptions.minimumFractionDigits = fractionDigits;
             }
 
-            if (maximumSignificantDigits) {
+            // toLocaleString output is "0.0" instead of "0" for HTC browsers
+            // when maximumSignificantDigits is set. See #96.
+            if (maximumSignificantDigits && number > 0) {
                 localeStringOptions.maximumSignificantDigits = maximumSignificantDigits;
             }
 

diff --git a/test/moment-duration-format-tests.js b/test/moment-duration-format-tests.js
@@ -508,6 +508,8 @@ test("userLocale and useGrouping", function () {
 });
 
 test("useSignificantDigits", function () {
+    equal(moment.duration(0, "seconds").format("s", { useSignificantDigits: true, precision: 0 }), "0");
+    equal(moment.duration(0, "seconds").format("s", { useSignificantDigits: true, precision: 0, useToLocaleString: false }), "0");
 	equal(moment.duration(99999, "seconds").format("s", { useSignificantDigits: true, precision: 2 }), "100,000");
     equal(moment.duration(99.99, "seconds").format("s", { useSignificantDigits: true, precision: 3 }), "100");
     equal(moment.duration(99.9944, "seconds").format("s", { useSignificantDigits: true, precision: 5 }), "99.994");
@@ -543,6 +545,13 @@ test("useSignificantDigits and trunc", function () {
     }), "12:00");
 });
 
+test("useSignificantDigits and trim: false", function () {
+    equal(moment.duration(10, "seconds").format("h[h] m[m] s[s]",
+    { useSignificantDigits: true, trim: false }), "0h 0m 10s");
+    equal(moment.duration(10, "seconds").format("h[h] m[m] s[s]",
+    { useSignificantDigits: true, precision: 4, trim: false }), "0h 0m 10s");
+});
+
 test("Documentation examples", function () {
     equal(moment.duration(123, "minutes").format(), "2:03:00");
     equal(moment.duration(123, "months").format(), "10 years, 3 months");
@@ -1629,6 +1638,12 @@ test("Mixed positive and negative durations", function () {
 });
 
 test("useSignificantDigits", function () {
+    deepEqual(moment.duration.format([
+        moment.duration(10, "seconds"),
+        moment.duration(1000000, "seconds")],
+        "y[y] M[m] d[d] h[h] m[m] s[s]",
+        { useSignificantDigits: true, precision: 4, useToLocaleString: false }
+    ), ["0d 0h 10s", "11d 14h 0s"]);
     deepEqual(moment.duration.format([
         moment.duration(10, "seconds"),
         moment.duration(100, "seconds"),