fix: 🐛 Fixed "time-of-day" format for times after 12am (next day)

EricLambrecht · Mar 5, 2019 · 91c84f7 · 91c84f7
1 parent 4c34a12
commit 91c84f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/src/components/editor/EditorPlaylistItem.vue b/src/components/editor/EditorPlaylistItem.vue
@@ -12,7 +12,7 @@
       class="image"
     />
     <b-text v-if="showTimeOfDay" class="time time-of-day">
-      {{ item.track.relative_start_time_ms | formatTime('h:mm') }}
+      {{ item.track.relative_start_time_ms | formatTime('hh:mm') }}
     </b-text>
     <b-text v-else class="time duration">
       {{ item.track.duration_ms | formatTime('mm:ss') }}

diff --git a/src/utils/formatTime.js b/src/utils/formatTime.js
@@ -1,25 +1,17 @@
 import moment from 'moment';
 import 'moment-duration-format';
 
-const formatTime = (milliseconds, format = '') => {
-  const duration = moment.duration(milliseconds);
-
-  if (format) {
-    return duration.format(format);
-  }
+export const ONE_DAY_IN_MILLISECONDS = 86400000;
 
-  if (duration.days() > 0) {
-    return duration.format('D h:mm');
-  }
-  if (duration.hours() > 0) {
-    return duration.format('h:mm');
-  }
-
-  return duration.format('mm:ss');
+const formatTime = (milliseconds, format = 'h:mm') => {
+  const ms = milliseconds % ONE_DAY_IN_MILLISECONDS;
+  const duration = moment.duration(ms);
+  return duration.format(format, { trim: false });
 };
 
 export default formatTime;
 
+
 export const getHours = (milliseconds) => {
   const duration = moment.duration(milliseconds);
   return duration.hours();