put back and test fractional second zero removal in auto case

alexcjohnson · alexcjohnson · commit 70a0a367c270 · 2016-12-14T02:41:08.000-05:00
diff --git a/src/lib/dates.js b/src/lib/dates.js
@@ -423,7 +423,9 @@ function formatTime(x, tr) {
          */
         var sec = Math.min(mod(x / ONESEC, 60), MAXSECONDS[tr]);
 
-        timeStr += ':' + (100 + sec).toFixed(tr).substr(1);
+        timeStr += ':' + (
+            (100 + sec).toFixed(tr).substr(1).replace(/[\.]?0*$/, '')
+        );
     }
     return timeStr;
 }
diff --git a/test/jasmine/tests/lib_date_test.js b/test/jasmine/tests/lib_date_test.js
@@ -587,5 +587,17 @@ describe('dates', function() {
 
         });
 
+        it('should remove extra fractional second zeros', function() {
+            expect(Lib.formatDate(0.1, '', 4)).toBe('00:00:00.0001\nJan 1, 1970');
+            expect(Lib.formatDate(0.1, '', 3)).toBe('00:00:00\nJan 1, 1970');
+            expect(Lib.formatDate(0.1, '', 3, 'coptic'))
+                .toBe('00:00:00\nKoi 23, 1686');
+
+            // because the decimal point is explicitly part of the format
+            // string here, we can't remove it OR the very first zero after it.
+            expect(Lib.formatDate(0.1, '%S.%f')).toBe('00.0001');
+            expect(Lib.formatDate(0.1, '%S.%3f')).toBe('00.0');
+        });
+
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,9 @@ function formatTime(x, tr) {`
`423`	`423`	`*/`
`424`	`424`	`var sec = Math.min(mod(x / ONESEC, 60), MAXSECONDS[tr]);`
`425`	`425`
`426`		`- timeStr += ':' + (100 + sec).toFixed(tr).substr(1);`
	`426`	`+ timeStr += ':' + (`
	`427`	`+ (100 + sec).toFixed(tr).substr(1).replace(/[\.]?0*$/, '')`
	`428`	`+ );`
`427`	`429`	`}`
`428`	`430`	`return timeStr;`
`429`	`431`	`}`