summaryrefslogtreecommitdiff
path: root/animism-align
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-08-28 17:09:08 +0200
committerJules Laplace <julescarbon@gmail.com>2020-08-28 17:09:08 +0200
commit965a6f89aeeefd527bf8b253fa2931e940ea2842 (patch)
treeda18b617636f87fcd6983298234725f950f77669 /animism-align
parentc774225af4eed9786f43d1077336425daa61c1e2 (diff)
proper timing on inline images
Diffstat (limited to 'animism-align')
-rw-r--r--animism-align/frontend/app/utils/transcript.utils.js4
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js8
-rw-r--r--animism-align/frontend/app/views/viewer/player/player.transcript.css2
3 files changed, 9 insertions, 5 deletions
diff --git a/animism-align/frontend/app/utils/transcript.utils.js b/animism-align/frontend/app/utils/transcript.utils.js
index f6ab7a8..3a21bda 100644
--- a/animism-align/frontend/app/utils/transcript.utils.js
+++ b/animism-align/frontend/app/utils/transcript.utils.js
@@ -54,6 +54,7 @@ export const buildParagraphs = (annotationOrder, sectionCount) => {
type: annotation.type,
start_ts: annotation.start_ts,
end_ts: 0,
+ isMedia: true,
annotations: [annotation],
})
}
@@ -99,6 +100,9 @@ export const buildParagraphs = (annotationOrder, sectionCount) => {
if (!paragraphs[i].end_ts) {
paragraphs[i].end_ts = paragraphs[i+1].start_ts - 0.1
}
+ if (paragraphs[i].isMedia) {
+ paragraphs[i].start_ts = paragraphs[i+1].start_ts - 0.01
+ }
}
return paragraphs
}
diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js
index 9928eef..7e237a1 100644
--- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js
+++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js
@@ -10,18 +10,18 @@ export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotati
if (!item) return <div>Media not found: {annotation.settings.media_id}</div>
if (annotation.settings.fullscreen) {
return (
- <div className="media image fullscreen">
- <div className="speaker-icon" onClick={e => onAnnotationClick(e, paragraph, annotation)}>{SpeakerIcon}</div>
+ <div className="media image fullscreen" onClick={e => onAnnotationClick(e, paragraph, annotation)}>
+ <div className="speaker-icon">{SpeakerIcon}</div>
<div className="img" style={{ backgroundImage: 'url(' + item.settings.display.url + ')'}} />
<MediaCitation media={item} />
</div>
)
} else {
return (
- <div className="media image">
+ <div className="media image" onClick={e => onAnnotationClick(e, paragraph, annotation)}>
<div className="image-container">
<img src={item.settings.display.url} />
- <div className="speaker-icon" onClick={e => onAnnotationClick(e, paragraph, annotation)}>{SpeakerIcon}</div>
+ <div className="speaker-icon">{SpeakerIcon}</div>
</div>
<MediaCitation media={item} />
</div>
diff --git a/animism-align/frontend/app/views/viewer/player/player.transcript.css b/animism-align/frontend/app/views/viewer/player/player.transcript.css
index 7e0b302..ef7bbc7 100644
--- a/animism-align/frontend/app/views/viewer/player/player.transcript.css
+++ b/animism-align/frontend/app/views/viewer/player/player.transcript.css
@@ -162,7 +162,7 @@
cursor: pointer;
display: block;
max-width: 100%;
- max-height: 90vh;
+ max-height: calc(100vh - 7rem);
}
.player-transcript .media.fullscreen .img {
width: 100vw;