0x2620/phantasma
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use per clip color

Browse source
This commit is contained in:
j 2021-11-24 12:20:27 +01:00
parent d18e7e96fc
commit 16a9439152
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/static/js/ascroll.js
View file

@ -195,10 +195,9 @@ function showOverlay(event) {
function renderAnnotation(config, video, ascroll, clip) { function renderAnnotation(config, video, ascroll, clip) {
var div = document.createElement('div') var div = document.createElement('div')
div.classList.add('annotation') div.classList.add('annotation')
var annotation = clip.annotations[0]
var annotation = clip[0] var color1 = `hsl(${clip.color1.hue}, 60%, 15%)`
var color1 = `hsl(${annotation.color1.hue}, 60%, 15%)` var color2 = `hsl(${clip.color2.hue}, 60%, 15%)`
var color2 = `hsl(${annotation.color2.hue}, 60%, 15%)`
if (!config.first) { if (!config.first) {
config.first = annotation config.first = annotation
config.info.style.background = color1 config.info.style.background = color1
@ -211,7 +210,7 @@ function renderAnnotation(config, video, ascroll, clip) {
figcaption = `<figcaption><a href="${pandoraURL}/${annotation.id}" target="_blank">${txt}</a></figcaption>` figcaption = `<figcaption><a href="${pandoraURL}/${annotation.id}" target="_blank">${txt}</a></figcaption>`
} }
var values = [] var values = []
clip.forEach(a => { clip.annotations.forEach(a => {
values.push(a.value.replace(/src="\//g, `src="${pandoraURL}/`).replace(/href="\//g, `href="${pandoraURL}/`)) values.push(a.value.replace(/src="\//g, `src="${pandoraURL}/`).replace(/href="\//g, `href="${pandoraURL}/`))
}) })
values = values.join('<br><br>') values = values.join('<br><br>')
@ -290,22 +289,29 @@ async function loadClips(annotations) {
colors[clip.id] = clip colors[clip.id] = clip
}) })
var previous var previous
annotations.forEach(annotation => { annotations.forEach(annotation => {
var clipId = annotation.id.split('/')[0] + '/' + annotation.in.toFixed(3) + '-'+ annotation.out.toFixed(3) var clipId = annotation.id.split('/')[0] + '/' + annotation.in.toFixed(3) + '-'+ annotation.out.toFixed(3)
clips[clipId] = clips[clipId] || [] clips[clipId] = clips[clipId] || {
clips[clipId].push(annotation) id: clipId,
annotation.color1 = colors[clipId] color1: colors[clipId],
annotations: []
if(previous) { }
previous.color2 = annotation.color1 clips[clipId].annotations.push(annotation)
annotation.color1 = colors[clipId]
if(previous && previous.id != clipId) {
previous.color2 = clips[clipId].color1
}
if (!previous || previous.id != clipId) {
previous = clips[clipId]
} }
previous = annotation
}) })
if (annotations.length) { var clips = Object.values(clips)
annotations[annotations.length - 1].color2 = annotations[0].color1 if (clips.length) {
clips[clips.length - 1].color2 = clips[0].color1
} }
//return annotations //return annotations
return Object.values(clips) return clips
}) })
} }