summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-08-18 16:50:12 +0200
committerJules Laplace <julescarbon@gmail.com>2020-08-18 16:50:12 +0200
commit6ec0031e7ec008faccbbace2363f9240c7e08ec7 (patch)
treeaae266c128734a3ef2bb4ca44edd05d3405f9932
parent128d6ee5c937652813c7a9aed198239f1d74c96d (diff)
adding schedule again
-rw-r--r--animism-align/frontend/app/constants.js2
-rw-r--r--animism-align/frontend/app/views/align/components/annotations/annotationTypes/annotationTypes.utility.js3
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js10
3 files changed, 9 insertions, 6 deletions
diff --git a/animism-align/frontend/app/constants.js b/animism-align/frontend/app/constants.js
index cd2b3fd..6650bee 100644
--- a/animism-align/frontend/app/constants.js
+++ b/animism-align/frontend/app/constants.js
@@ -58,7 +58,7 @@ export const MEDIA_LABEL_TYPES = {
}
export const INLINE_UTILITY_ANNOTATION_TYPES = new Set([
- 'intro',
+ 'intro', 'schedule',
])
export const FULLSCREEN_UTILITY_ANNOTATION_TYPES = new Set([
diff --git a/animism-align/frontend/app/views/align/components/annotations/annotationTypes/annotationTypes.utility.js b/animism-align/frontend/app/views/align/components/annotations/annotationTypes/annotationTypes.utility.js
index 45ea239..55257ef 100644
--- a/animism-align/frontend/app/views/align/components/annotations/annotationTypes/annotationTypes.utility.js
+++ b/animism-align/frontend/app/views/align/components/annotations/annotationTypes/annotationTypes.utility.js
@@ -38,6 +38,9 @@ export const AnnotationIntro = ({ y, annotation, timeline, selected, onClick, on
export const AnnotationSchedule = ({ y, annotation, timeline, selected, onClick, onDoubleClick }) => {
const className = selected ? 'annotation utility schedule selected' : 'annotation utility schedule'
+ let style = {
+ top: y,
+ }
return (
<div
className={className}
diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js
index f42e550..d185722 100644
--- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js
+++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js
@@ -8,10 +8,6 @@ export const Intro = ({ paragraph, media, currentParagraph, currentAnnotation, o
const style = {
backgroundImage: 'url(' + item.settings.file.url + ')',
}
- const nameLookup = Object.values(media.lookup).reduce((a,b) => {
- a.add(b.author)
- return a
- }, new Set)
return (
<div
className='site-intro'
@@ -25,7 +21,11 @@ export const Intro = ({ paragraph, media, currentParagraph, currentAnnotation, o
)
}
-export const Schedule = ({}) => {
+export const Schedule = ({ media }) => {
+ const nameLookup = Object.values(media.lookup).reduce((a,b) => {
+ a.add(b.author)
+ return a
+ }, new Set)
return (
<div>
<div className='schedule'>