Merge branch 'main' of git.0x2620.org:0x2620/aab21 into main

app/static/js/film.js

@@ -1,4 +1,5 @@
 var videoExtension
+var continueTimecode
 
 function setVideoSrc(video, src) {
     var ext
@@ -25,6 +26,9 @@ document.querySelector('a#play-fullscreen').addEventListener('click', event => {
     video.controls = true
     document.querySelector('main').appendChild(video)
     video.style.display = 'none'
+    if (continueTimecode) {
+        video.currentTime = continueTimecode
+    }
     function enterFullscreen(event) {
         video.requestFullscreen().catch(err => {
             console.log(`Error attempting to enable full-screen mode: ${err.message} (${err.name})`);
@@ -37,7 +41,8 @@ document.querySelector('a#play-fullscreen').addEventListener('click', event => {
     }
     video.addEventListener('play', enterFullscreen);
     video.addEventListener('fullscreenchange', event => {
-        if (!document.fullscreen) {
+        if (document.fullscreenElement === null) {
+            continueTimecode = video.currentTime
             video.remove()
             if (document.fullscreenElement) {
                 document.exitFullscreen();
@@ -47,6 +52,7 @@ document.querySelector('a#play-fullscreen').addEventListener('click', event => {
     video.addEventListener('pause', event => {
     })
     video.addEventListener('ended', event => {
+        continueTimecode = 0
         video.remove()
         if (document.fullscreenElement) {
             document.exitFullscreen();

app/templates/film.html

@@ -33,7 +33,7 @@ body {
 				
 		</div>	
 		<div class="video-block">			
-			<video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" autoplay loop muted playsinline></video>
+			<video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" poster="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.jpg" autoplay loop muted playsinline></video>
 		</div>
 		<div class="summary-block">
 			<p>{{ film.data.summary|safe }}</p>