aware of end_ts...

3 files changed, 7 insertions, 29 deletions

diff --git a/animism-align/frontend/app/utils/annotation.utils.js b/animism-align/frontend/app/utils/annotation.utils.js
index 0884f62..4dd7478 100644
--- a/animism-align/frontend/app/utils/annotation.utils.js
+++ b/animism-align/frontend/app/utils/annotation.utils.js
@@ -16,7 +16,10 @@ export const annotationFadeTimings = annotation => {
   }
 }
 
-export const thumbnailURL = data => {
-  if (data.type === 'video') return data.settings.video.thumbnail_url
-  if (data.type === 'image') return data.settings.thumbnail.url
+export const thumbnailURL = media => {
+  switch (media.type) {
+    case 'video': return media.settings.video.thumbnail_url
+    case 'image': return media.settings.thumbnail.url
+    default:      return null
+  }
 }
diff --git a/animism-align/frontend/app/utils/transcript.utils.js b/animism-align/frontend/app/utils/transcript.utils.js
index 8386227..c913f9a 100644
--- a/animism-align/frontend/app/utils/transcript.utils.js
+++ b/animism-align/frontend/app/utils/transcript.utils.js
@@ -59,6 +59,7 @@ export const buildParagraphs = annotationOrder => {
       currentParagraph.annotations.push(annotation)
     }
   })
+  // finally, go over the paragraphs and update their end_ts, if none is set
   for (let i = 0; i < (paragraphs.length - 1); i++) {
     if (!paragraphs[i].end_ts) {
       paragraphs[i].end_ts = paragraphs[i+1].start_ts - 0.1
diff --git a/animism-align/frontend/app/views/annotation/annotation.util.js b/animism-align/frontend/app/views/annotation/annotation.util.js
deleted file mode 100644
index 680de5e..0000000
--- a/animism-align/frontend/app/views/annotation/annotation.util.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { timestampToSeconds } from 'app/utils'
-
-export const thumbnailURL = data => {
-  switch (data.type) {
-    case 'video': return data.settings.video.thumbnail_url
-    case 'image': return data.settings.thumbnail.url
-    default:      return null
-  }
-}
-
-export const annotationFadeTimings = annotation => {
-  const fadeInDurationInSeconds = timestampToSeconds(annotation.settings.fade_in_duration || '0')
-  const fadeOutDurationInSeconds = timestampToSeconds(annotation.settings.fade_out_duration || '0')
-  const durationInSeconds = timestampToSeconds(annotation.settings.duration || '0')
-
-  const start_ts = annotation.start_ts
-  const end_ts = start_ts + durationInSeconds
-  const fade_in_end_ts = start_ts + fadeInDurationInSeconds
-  const fade_out_start_ts = end_ts - fadeOutDurationInSeconds
-
-  return {
-    fadeInDurationInSeconds, fadeOutDurationInSeconds, durationInSeconds,
-    start_ts, end_ts, fade_in_end_ts, fade_out_start_ts,
-  }
-}
-