fix: Fix setting service when consent is not required

Also hide `<evlplayer />` with no default video Fixes #73
StarCitizenWiki · Nov 11, 2023 · 01cfcd7 · 01cfcd7
1 parent cd53e51
commit 01cfcd7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/extension.json b/extension.json
@@ -70,7 +70,8 @@
 				{ "name": "iframe.js", "file": "modules/iframe.js" }
 			],
 			"styles": [
-				"ext.embedVideo.consent.less"
+				"ext.embedVideo.consent.less",
+				"ext.embedVideo.evl.less"
 			],
 			"position": "top",
 			"targets": [

diff --git a/resources/ext.embedVideo.evl.less b/resources/ext.embedVideo.evl.less
@@ -0,0 +1,5 @@
+.evlplayer {
+  &[data-service="videolink"] {
+	display: none;
+  }
+}
diff --git a/resources/ext.embedVideo.videolink.js b/resources/ext.embedVideo.videolink.js
@@ -6,12 +6,15 @@ const {makeIframe, fetchThumb} = require('./iframe.js');
             evl.addEventListener('click', e => {
                 e.preventDefault();
 
-                const player = evl?.dataset?.player ?? 'default';
-                const iframeConfig = JSON.parse(evl.dataset.iframeconfig);
+                const player = evl.dataset?.player ?? 'default';
+                const iframeConfig = JSON.parse(evl.dataset?.iframeconfig ?? '{}');
 
-                const iframe = document.querySelector(`.embedvideo.evlplayer-${player} iframe`);
+                const playerContainer = document.querySelector(`.embedvideo.evlplayer-${player}`);
+                const iframe = playerContainer.querySelector('iframe');
                 // Iframe exists, no consent required or already given
                 if (iframe !== null) {
+                    playerContainer.dataset.service = evl.dataset?.service ?? 'youtube';
+
                     for (const [key, value] of Object.entries(iframeConfig)) {
                         iframe.setAttribute(key, value);
                     }