From 4e2121e9160b627415a31f628fa3f00711138375 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 2 Nov 2020 16:38:13 +0100
Subject: images can include images from galleries. command to duplicate
 annotations

---
 .../viewer/player/components.fullscreen/fullscreen.image.js    |  9 ++++++++-
 .../app/views/viewer/player/components.inline/inline.image.js  | 10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'animism-align/frontend/app/views/viewer/player')

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} />
-- 
cgit v1.2.3-70-g09d2