summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app/views/viewer/player
diff options
context:
space:
mode:
Diffstat (limited to 'animism-align/frontend/app/views/viewer/player')
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js2
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.media/media.citation.js8
2 files changed, 7 insertions, 3 deletions
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 ba3df4c..8898ad9 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
@@ -21,7 +21,7 @@ export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotati
}
url = frame.url
captionItem = item.settings.caption_lookup[frame_id]
- if (!captionItem.short_caption) {
+ if (!captionItem.caption) {
captionItem = item
}
colorName = annotation.settings.inline_color || annotation.settings.color || 'white'
diff --git a/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js b/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js
index ea20a3b..bbe498f 100644
--- a/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js
+++ b/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js
@@ -7,16 +7,20 @@ export const MediaCitation = ({ media }) => {
)
}
const settings = media.settings || media
+
+ // citations - so many names for the same thing
if (settings.bibliography) {
return (
<div className='citation' dangerouslySetInnerHTML={{ __html: settings.bibliography }} />
)
}
- if (settings.short_caption) {
+ if (settings.caption) {
return (
- <div className='citation' dangerouslySetInnerHTML={{ __html: settings.short_caption }} />
+ <div className='citation' dangerouslySetInnerHTML={{ __html: settings.caption }} />
)
}
+
+ // generated citations
return (
<div className='citation'>
{media.author}