From 3901cec2615cca7964341e495d4d2eec0f8bde7e Mon Sep 17 00:00:00 2001
From: Mason Ballengee <masaball@iu.edu>
Date: Fri, 20 Oct 2023 16:10:07 -0400
Subject: [PATCH 1/2] Fix player assignment for create thumbnail

Co-authored-by: Dananji Withana <dwithana@iu.edu>
---
 app/views/media_objects/_thumbnail.html.erb | 23 ++++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/views/media_objects/_thumbnail.html.erb b/app/views/media_objects/_thumbnail.html.erb
index 74c66d02a6..dc50634ff8 100644
--- a/app/views/media_objects/_thumbnail.html.erb
+++ b/app/views/media_objects/_thumbnail.html.erb
@@ -45,16 +45,18 @@ Unless required by applicable law or agreed to in writing, software distributed
 <% content_for :page_scripts do %>
 <script>
   $(document).ready(function() {
+    const mediaObject = <%= @media_object.to_json.html_safe %>;
+    let baseUrl = ''
+    let offset = ''
     let timeCheck = setInterval(enableCreateThumbnail, 500);
+
     function enableCreateThumbnail() {
       let player = document.getElementById('iiif-media-player');
-      // Grab environmental variables
-      let baseUrl = '/master_files/' + "<%= @currentStreamInfo[:id] %>";
 
-      if(player) {
+      if (player && player.player != undefined) {
         player.player.on('loadedmetadata', () => {
           let thumbnailBtn = document.getElementById('create-thumbnail-btn');
-          if(thumbnailBtn) {
+          if (thumbnailBtn) {
             thumbnailBtn.disabled = false;
           }
           clearInterval(timeCheck);
@@ -62,12 +64,13 @@ Unless required by applicable law or agreed to in writing, software distributed
       }
 
       $('#thumbnailModal').on('show.bs.modal', function(e) {
-        if (player.player.isFullScreen) {
-          player.player.exitFullScreen();
-        }
-
+        let currentPlayer = document.getElementById('iiif-media-player');
         let $imgPolaroid = document.getElementById('img-polaroid');
-        let offset = player.player.currentTime();
+        offset = currentPlayer.player.currentTime();
+
+        canvasIndex = parseInt(currentPlayer.dataset.canvasindex);
+        const sectionId = mediaObject.files[canvasIndex].id;
+        baseUrl = '/master_files/' + sectionId;
 
         if ($imgPolaroid) {
           let src = baseUrl + '/poster?offset=' + offset + '&preview=true';
@@ -90,7 +93,7 @@ Unless required by applicable law or agreed to in writing, software distributed
           url: baseUrl + '/still',
           type: 'POST',
           data: {
-            offset: player.player.currentTime()
+            offset: offset
           }
         })
           .done(response => {

From e2a4255c8e36cb3264c192123e8de7435b5abae2 Mon Sep 17 00:00:00 2001
From: Mason Ballengee <masaball@iu.edu>
Date: Tue, 31 Oct 2023 10:43:15 -0400
Subject: [PATCH 2/2] Limit scope of json to section ids

Co-authored-by: Chris Colvard <chris.colvard@gmail.com>
---
 app/views/media_objects/_thumbnail.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/media_objects/_thumbnail.html.erb b/app/views/media_objects/_thumbnail.html.erb
index dc50634ff8..7f67cff375 100644
--- a/app/views/media_objects/_thumbnail.html.erb
+++ b/app/views/media_objects/_thumbnail.html.erb
@@ -45,7 +45,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 <% content_for :page_scripts do %>
 <script>
   $(document).ready(function() {
-    const mediaObject = <%= @media_object.to_json.html_safe %>;
+    const sectionIds = <%= @media_object.ordered_master_file_ids.to_json.html_safe %>;
     let baseUrl = ''
     let offset = ''
     let timeCheck = setInterval(enableCreateThumbnail, 500);
@@ -69,7 +69,7 @@ Unless required by applicable law or agreed to in writing, software distributed
         offset = currentPlayer.player.currentTime();
 
         canvasIndex = parseInt(currentPlayer.dataset.canvasindex);
-        const sectionId = mediaObject.files[canvasIndex].id;
+        const sectionId = sectionIds[canvasIndex];
         baseUrl = '/master_files/' + sectionId;
 
         if ($imgPolaroid) {