From 952a9c8eb268cf52dd9af13fba8eec17ca9d2730 Mon Sep 17 00:00:00 2001
From: Mason Ballengee <masaball@iu.edu>
Date: Mon, 2 Oct 2023 16:40:08 -0400
Subject: [PATCH 1/2] Update player API to work with new embedded player

---
 app/views/master_files/_player.html.erb | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/master_files/_player.html.erb b/app/views/master_files/_player.html.erb
index bb5d3723b6..0db69e9519 100644
--- a/app/views/master_files/_player.html.erb
+++ b/app/views/master_files/_player.html.erb
@@ -19,18 +19,19 @@ Unless required by applicable law or agreed to in writing, software distributed
 <% content_for :page_scripts do %>
 
   <script>
-    <%# Add an offscreen button to allow for proper keyboard navigation through player controls %>
-    $('#content').append('<button id="after-player" style="position:absolute;top:-1000px"></button>')
-
     window.addEventListener('message', function(event) {
       var command = event.data.command;
-      if (command=='play') currentPlayer.play();
-      else if (command=='pause') currentPlayer.pause();
-      else if (command=='toggle_loop') currentPlayer.loop = !currentPlayer.loop;
-      else if (command=='set_offset') currentPlayer.setCurrentTime(event.data.offset); // time is in seconds
-      else if (command=='get_offset') event.source.postMessage({'command':'currentTime','currentTime':currentPlayer.getCurrentTime()}, event.origin);
+      let embeddedPlayer = videojs(document.getElementById('video-js-embed-<%= @master_file.id %>_html5_api'))
+
+      if (command=='play') embeddedPlayer.play();
+      else if (command=='pause') embeddedPlayer.pause();
+      else if (command=='toggle_loop') {
+        embeddedPlayer.loop() ? embeddedPlayer.loop(false): embeddedPlayer.loop(true);
+        embeddedPlayer.autoplay() ? embeddedPlayer.autoplay(false) : embeddedPlayer.autoplay(true);
+      }
+      else if (command=='set_offset') embeddedPlayer.currentTime(event.data.offset); // time is in seconds
+      else if (command=='get_offset') event.source.postMessage({'command':'currentTime','currentTime':embeddedPlayer.currentTime()}, event.origin);
     });
-
   </script>
 
   <style>

From 4fddb64bf1a8a8ddeb9790205dbc5cdf883bd201 Mon Sep 17 00:00:00 2001
From: Mason Ballengee <masaball@iu.edu>
Date: Tue, 3 Oct 2023 09:15:14 -0400
Subject: [PATCH 2/2] Use preferred method for getting videojs player

Co-authored-by: Chris Colvard <chris.colvard@gmail.com>
---
 app/views/master_files/_player.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/master_files/_player.html.erb b/app/views/master_files/_player.html.erb
index 0db69e9519..1cea3dcb24 100644
--- a/app/views/master_files/_player.html.erb
+++ b/app/views/master_files/_player.html.erb
@@ -21,7 +21,7 @@ Unless required by applicable law or agreed to in writing, software distributed
   <script>
     window.addEventListener('message', function(event) {
       var command = event.data.command;
-      let embeddedPlayer = videojs(document.getElementById('video-js-embed-<%= @master_file.id %>_html5_api'))
+      let embeddedPlayer = videojs.getPlayer('video-js-embed-<%= @master_file.id %>_html5_api');
 
       if (command=='play') embeddedPlayer.play();
       else if (command=='pause') embeddedPlayer.pause();