From 5a681ef654a8ced83234f0302a08e467e4ca8ae5 Mon Sep 17 00:00:00 2001 From: j Date: Mon, 25 Oct 2021 16:04:44 +0100 Subject: [PATCH 1/3] avoid src change to same url --- app/static/js/ascroll.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/static/js/ascroll.js b/app/static/js/ascroll.js index d597bf2..c0de32b 100644 --- a/app/static/js/ascroll.js +++ b/app/static/js/ascroll.js @@ -35,7 +35,10 @@ function setVideoSrc(video, src) { } }) } - video.src = src.replace('.webm', videoExtension) + src = src.replace('.webm', videoExtension) + if (src != video.src) { + video.src = src + } } function updatePlayer(video, frame, currentTime, out, src) { From 98d6b482fd9da9f79033f906f9f0be7531fda4f1 Mon Sep 17 00:00:00 2001 From: j Date: Mon, 25 Oct 2021 16:11:50 +0100 Subject: [PATCH 2/3] images --- app/static/css/partials/_ascroll.scss | 10 ++++++++++ app/static/js/ascroll.js | 1 + 2 files changed, 11 insertions(+) diff --git a/app/static/css/partials/_ascroll.scss b/app/static/css/partials/_ascroll.scss index be1dfbd..523779b 100755 --- a/app/static/css/partials/_ascroll.scss +++ b/app/static/css/partials/_ascroll.scss @@ -58,6 +58,16 @@ padding: 20px 20px; font-size: 22px; line-height: 26px; + + figure { + width: 100%; + text-align: center; + } + + img { + margin: auto; + max-width: 100%; + } } } } diff --git a/app/static/js/ascroll.js b/app/static/js/ascroll.js index c0de32b..271b3d2 100644 --- a/app/static/js/ascroll.js +++ b/app/static/js/ascroll.js @@ -219,6 +219,7 @@ function renderAnnotation(config, video, ascroll, annotation) { if (annotation.title) { figcaption = `
${annotation.title}
` } + annotation.value = annotation.value.replace('src="/', `src="${baseURL}/`).replace('href="/', `href="${baseURL}/`) div.innerHTML = `
From 476acff1fe200a5c17aeae0c2109d9437b9b10fa Mon Sep 17 00:00:00 2001 From: j Date: Mon, 25 Oct 2021 16:17:36 +0100 Subject: [PATCH 3/3] no lonks on assemblies list --- app/templates/texts.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/texts.html b/app/templates/texts.html index ffb60c9..02897aa 100644 --- a/app/templates/texts.html +++ b/app/templates/texts.html @@ -6,7 +6,7 @@ {% for text in texts %}

{{ text.title | safe }}

-

{{ text.byline|safe }}

+

{{ text.byline|striptags }}

{% endfor %} {% endblock %}