summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app/views/viewer
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-11-02 16:38:13 +0100
committerJules Laplace <julescarbon@gmail.com>2020-11-02 16:38:13 +0100
commit4e2121e9160b627415a31f628fa3f00711138375 (patch)
treea0d328b4e0bd3fd92c9326a52c2e22bab130bf2a /animism-align/frontend/app/views/viewer
parentfaee66ed90bca15fa803deb733cbe9ccce9c19d8 (diff)
images can include images from galleries. command to duplicate annotations
Diffstat (limited to 'animism-align/frontend/app/views/viewer')
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js9
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js10
2 files changed, 17 insertions, 2 deletions
diff --git a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js
index 85badb0..ead2591 100644
--- a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js
+++ b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js
@@ -10,13 +10,20 @@ export const FullscreenImage = ({ element, media, transitionDuration }) => {
color: color.textColor,
transitionDuration,
}
+ let url;
+ if (item.type === 'gallery' && item.settings.display_lookup[element.annotation.settings.frame_index]) {
+ url = item.settings.display_lookup[element.annotation.settings.frame_index].url
+ } else {
+ url = item.settings.display.url
+ }
+
return (
<div
className='fullscreen-element image'
style={style}
>
<div style={{
- backgroundImage: 'url(' + item.settings.display.url + ')',
+ backgroundImage: 'url(' + url + ')',
}} />
</div>
)
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 10a4653..1f81aae 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
@@ -8,6 +8,14 @@ export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotati
const annotation = paragraph.annotations[0]
const item = media.lookup[annotation.settings.media_id]
if (!item) return <div>Media not found: {annotation.settings.media_id}</div>
+
+ let url;
+ if (item.type === 'gallery' && item.settings.display_lookup[annotation.settings.frame_index]) {
+ url = item.settings.display_lookup[annotation.settings.frame_index].url
+ } else {
+ url = item.settings.display.url
+ }
+
if (annotation.settings.fullscreen) {
return (
<div className="media image fullscreen" onClick={e => onAnnotationClick(e, paragraph, annotation)}>
@@ -21,7 +29,7 @@ export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotati
return (
<div className="media image" onClick={e => onAnnotationClick(e, paragraph, annotation)}>
<div className="image-container">
- <img src={item.settings.display.url} />
+ <img src={url} />
<div className="speaker-icon">{SpeakerIcon}</div>
</div>
<MediaCitation media={item} />