Merge pull request #469 from AKSW/develop

Fix chat/stream for some devices
AKSW · Apr 17, 2024 · 2b72157 · 2b72157
2 parents ff76024 + 2265913
commit 2b72157
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/graph.nt b/graph.nt
@@ -1564,10 +1564,10 @@
 <https://2024.dataweek.de/lswt2024/#Team> <http://www.w3.org/2000/01/rdf-schema#label> "LSWT Team"@de .
 <https://2024.dataweek.de/lswt2024/#Team> <http://www.w3.org/2000/01/rdf-schema#label> "LSWT Team"@en .
 <https://2024.dataweek.de/lswt2024/#programm-session-1> <http://purl.org/dc/terms/date> "2024-04-18"^^<http://www.w3.org/2001/XMLSchema#date> .
-<https://2024.dataweek.de/lswt2024/#programm-session-1> <http://purl.org/dc/terms/description> "Bei der Begrüßung freuen wir uns darauf, alle Teilnehmer herzlich zu begrüßen und einen Überblick über die Sitzungen des Tages zu geben. "@de .
+<https://2024.dataweek.de/lswt2024/#programm-session-1> <http://purl.org/dc/terms/description> "Bei der Begrüßung freuen wir uns darauf, alle Teilnehmer:innen herzlich zu begrüßen und einen Überblick über die Sitzungen des Tages zu geben. "@de .
 <https://2024.dataweek.de/lswt2024/#programm-session-1> <http://purl.org/dc/terms/description> "During the welcome, we are excited to extend a warm welcome to all participants and share an overview of the day's sessions with you."@en .
-<https://2024.dataweek.de/lswt2024/#programm-session-1> <http://purl.org/dc/terms/title> "Welcome & Keynote by Ben Gardner (AstraZeneca)"@de .
-<https://2024.dataweek.de/lswt2024/#programm-session-1> <http://purl.org/dc/terms/title> "Welcome & Keynote by Ben Gardner (AstraZeneca)"@en .
+<https://2024.dataweek.de/lswt2024/#programm-session-1> <http://purl.org/dc/terms/title> "Welcome"@de .
+<https://2024.dataweek.de/lswt2024/#programm-session-1> <http://purl.org/dc/terms/title> "Welcome"@en .
 <https://2024.dataweek.de/lswt2024/#programm-session-1> <http://schema.org/availableLanguage> <http://lexvo.org/id/iso639-3/eng> .
 <https://2024.dataweek.de/lswt2024/#programm-session-1> <http://schema.org/endTime> "09:10:00.000"^^<http://www.w3.org/2001/XMLSchema#time> .
 <https://2024.dataweek.de/lswt2024/#programm-session-1> <http://schema.org/location> <https://dataweek.de/venue#Sitzungssaal> .
@@ -1732,8 +1732,8 @@
 <https://2024.dataweek.de/lswt2024/#programm-talk-25> <http://schema.org/startTime> "15:45:00.000"^^<http://www.w3.org/2001/XMLSchema#time> .
 <https://2024.dataweek.de/lswt2024/#programm-talk-25> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Event> .
 <https://2024.dataweek.de/lswt2024/#programm-talk-3> <http://purl.org/dc/terms/date> "2024-04-18"^^<http://www.w3.org/2001/XMLSchema#date> .
-<https://2024.dataweek.de/lswt2024/#programm-talk-3> <http://purl.org/dc/terms/title> "Enabling new medicines with FAIR Data-centricity: Delivering Linked Data inside the enterprise"@de .
-<https://2024.dataweek.de/lswt2024/#programm-talk-3> <http://purl.org/dc/terms/title> "Enabling new medicines with FAIR Data-centricity: Delivering Linked Data inside the enterprise"@en .
+<https://2024.dataweek.de/lswt2024/#programm-talk-3> <http://purl.org/dc/terms/title> "Keynote by Ben Gardner (AstraZeneca): Enabling new medicines with FAIR Data-centricity: Delivering Linked Data inside the enterprise"@de .
+<https://2024.dataweek.de/lswt2024/#programm-talk-3> <http://purl.org/dc/terms/title> "Keynote by Ben Gardner (AstraZeneca): Enabling new medicines with FAIR Data-centricity: Delivering Linked Data inside the enterprise"@en .
 <https://2024.dataweek.de/lswt2024/#programm-talk-3> <http://schema.org/availableLanguage> <http://lexvo.org/id/iso639-3/eng> .
 <https://2024.dataweek.de/lswt2024/#programm-talk-3> <http://schema.org/endTime> "10:00:00.000"^^<http://www.w3.org/2001/XMLSchema#time> .
 <https://2024.dataweek.de/lswt2024/#programm-talk-3> <http://schema.org/location> <https://dataweek.de/venue#Sitzungssaal> .

diff --git a/graph.nt.source b/graph.nt.source
@@ -1,2 +1,2 @@
 [email protected]:AKSW/leipzig.dataweek.de-model.git
-0b834982e4e7b8cd0f17b2423e37e8f08cdb0644
+602b4541e27d6ba4a3896fed25397dceb64ef7f8
diff --git a/live/stream.html b/live/stream.html
@@ -100,23 +100,12 @@
 
     <h1>DataWeek 2024 Live Stream</h1>
 
-    <div class="videoWrapper">
+    <div id="videoWrapper" class="videoWrapper">
       <!--
         <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/3FmUIvFg8QM"
         title="YouTube video player" frameborder="0" allow="accelerometer; autoplay;
         clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
       -->
-
-      <iframe
-        id="videoframe"
-        src="https://www.youtube-nocookie.com/embed/PGC6_xjmWeQ"
-        width="560"
-        height="315"
-        title="YouTube video player"
-        frameborder="0"
-        allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-        allowfullscreen>
-      </iframe>
     </div>
 
     <div id="stream_selection"></div>

diff --git a/resources/js/chat.js b/resources/js/chat.js
@@ -60,10 +60,19 @@ socket.on('server_message', (message) => {
 });
 
 function updateVideo(videoUrl) {
-  let currentUrl = document.getElementById('videoframe').getAttribute("src");
-  if (currentUrl != videoUrl) {
-    document.getElementById('videoframe').setAttribute("src", videoUrl);
-  }
+  let wrapper = document.getElementById('videoWrapper');
+  wrapper.innerHTML = `
+  <iframe
+  id="videoframe"
+  src="${videoUrl}"
+  width="560"
+  height="315"
+  title="YouTube video player"
+  frameborder="0"
+  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+  allowfullscreen>
+</iframe>
+`
 }
 
 socket.on('streams_update', (streamList) => {
@@ -85,7 +94,6 @@ function zapp(stream_id) {
   const message_box = document.getElementById('message-box');
   message_box.innerHTML = '';
   room_id = stream_id;
-  window.location.hash = "#" + room_id;
   socket.emit('client_zapp', stream_id);
 }