Merge pull request #969 from turt2live/travis/12h-ts-collision

ara4n · web-flow · commit 997551485012 · 2017-05-30T17:23:04.000+01:00
Remove space between time and AM/PM
diff --git a/src/DateUtils.js b/src/DateUtils.js
@@ -56,7 +56,7 @@ function twelveHourTime(date) {
     const minutes = pad(date.getMinutes());
     const ampm = date.getHours() >= 12 ? 'PM' : 'AM';
     hours = pad(hours ? hours : 12);
-    return `${hours}:${minutes} ${ampm}`;
+    return `${hours}:${minutes}${ampm}`;
 }
 
 module.exports = {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function twelveHourTime(date) {`
`56`	`56`	`const minutes = pad(date.getMinutes());`
`57`	`57`	`const ampm = date.getHours() >= 12 ? 'PM' : 'AM';`
`58`	`58`	`hours = pad(hours ? hours : 12);`
`59`		- return `${hours}:${minutes} ${ampm}`;
	`59`	+ return `${hours}:${minutes}${ampm}`;
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`module.exports = {`