From e89d8fd13d3e90503ac590f06f72347749ac12b5 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 2 Mar 2023 16:27:25 +0100 Subject: [PATCH] no stream prefix for now --- app/static/js/ascroll.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/static/js/ascroll.js b/app/static/js/ascroll.js index 0e30230..7453d4d 100644 --- a/app/static/js/ascroll.js +++ b/app/static/js/ascroll.js @@ -168,13 +168,13 @@ function renderAnnotation(config, video, root, clip) { } var values = [] clip.annotations.forEach(a => { - values.push(a.value.replace(/src="\//g, `src="${streamPrefix}/`).replace(/href="\//g, `href="${pandoraURL}/`)) + values.push(a.value.replace(/src="\//g, `src="${pandoraURL}/`).replace(/href="\//g, `href="${pandoraURL}/`)) }) values = values.join('

') div.innerHTML = `
- + ${figcaption}
@@ -187,7 +187,7 @@ function renderAnnotation(config, video, root, clip) { if (clip.src) { src = clip.src } else if (config.edit) { - src = `${streamPrefix}/${annotation.id.split('/')[0]}/480p.webm` + src = `${pandoraURL}/${annotation.id.split('/')[0]}/480p.webm` } if (config.loaded && visible) { updatePlayer(video, frame, annotation['in'], annotation['out'], src, config) @@ -213,7 +213,7 @@ function renderAnnotations(config) { video.WebKitPlaysInline = true video.muted = true if (config.item) { - setVideoSrc(video, `${streamPrefix}/${config.item}/480p.webm`) + setVideoSrc(video, `${pandoraURL}/${config.item}/480p.webm`) } video.addEventListener('timeupdate', timeupdate) video.addEventListener('touchstart', showOverlay) @@ -233,7 +233,7 @@ function renderAnnotations(config) { if (frame) { var src if (config.edit) { - src = `${streamPrefix}/${config.first.id.split('/')[0]}/480p.webm` + src = `${pandoraURL}/${config.first.id.split('/')[0]}/480p.webm` } updatePlayer(video, frame, config.first['in'], config.first['out'], src, config) } @@ -390,7 +390,7 @@ async function loadAnnotations(config) { function renderSingleMode(config) { var src config.annotations.forEach(annotation => { - src = annotation.src = `${streamPrefix}/${annotation.id.split('/')[0]}/480p.webm` + src = annotation.src = `${pandoraURL}/${annotation.id.split('/')[0]}/480p.webm` }) var div = document.createElement('div') var annotation = config.annotations[0].annotations[0] @@ -400,7 +400,7 @@ function renderSingleMode(config) { div.innerHTML = `
- + ${figcaption}
@@ -422,7 +422,7 @@ function renderSingleMode(config) { config.annotations.forEach(clip => { var values = [] clip.annotations.forEach(a => { - values.push(a.value.replace(/src="\//g, `src="${streamPrefix}/`).replace(/href="\//g, `href="${pandoraURL}/`)) + values.push(a.value.replace(/src="\//g, `src="${pandoraURL}/`).replace(/href="\//g, `href="${pandoraURL}/`)) }) values = values.join('

') var annot = document.createElement('div')