_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix hidden main cowebsite swape

Browse Source
This commit is contained in:
Alexis Faizeau 2022-02-15 16:00:35 +01:00
parent a52ad233d8
commit 06dd2202f6
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/Components/EmbedScreens/CamerasContainer.svelte
View File

@ -3,7 +3,7 @@
import { streamableCollectionStore } from "../../Stores/StreamableCollectionStore"; import { streamableCollectionStore } from "../../Stores/StreamableCollectionStore";
import MediaBox from "../Video/MediaBox.svelte"; import MediaBox from "../Video/MediaBox.svelte";
export let highlightedEmbedScreen: EmbedScreen | null; export let highlightedEmbedScreen: EmbedScreen | undefined;
export let full = false; export let full = false;
$: clickable = !full; $: clickable = !full;
</script> </script>

6
front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte
View File

@ -73,9 +73,9 @@
$mainCoWebsite !== undefined && $mainCoWebsite !== undefined &&
$mainCoWebsite.getId() === coWebsite.getId(); $mainCoWebsite.getId() === coWebsite.getId();
isHighlight = isHighlight =
$highlightedEmbedScreen !== null && $highlightedEmbedScreen !== undefined &&
$highlightedEmbedScreen.type === "cowebsite" && $highlightedEmbedScreen?.type === "cowebsite" &&
$highlightedEmbedScreen.embed.getId() === coWebsite.getId(); $highlightedEmbedScreen?.embed.getId() === coWebsite.getId();
} }
</script> </script>

6
front/src/Stores/EmbedScreensStore.ts
View File

@ -15,7 +15,7 @@ export type EmbedScreen =
}; };
function createHighlightedEmbedScreenStore() { function createHighlightedEmbedScreenStore() {
const { subscribe, set, update } = writable<EmbedScreen | null>(null); const { subscribe, set, update } = writable<EmbedScreen | undefined>(undefined);
return { return {
subscribe, subscribe,
@ -23,7 +23,7 @@ function createHighlightedEmbedScreenStore() {
set(embedScreen); set(embedScreen);
}, },
removeHighlight: () => { removeHighlight: () => {
set(null); set(undefined);
}, },
toggleHighlight: (embedScreen: EmbedScreen) => { toggleHighlight: (embedScreen: EmbedScreen) => {
update((currentEmbedScreen) => update((currentEmbedScreen) =>
@ -36,7 +36,7 @@ function createHighlightedEmbedScreenStore() {
currentEmbedScreen.type === "streamable" && currentEmbedScreen.type === "streamable" &&
embedScreen.embed.uniqueId !== currentEmbedScreen.embed.uniqueId) embedScreen.embed.uniqueId !== currentEmbedScreen.embed.uniqueId)
? embedScreen ? embedScreen
: null : undefined
); );
}, },
}; };

7
front/src/WebRtc/CoWebsiteManager.ts
View File

@ -561,6 +561,13 @@ class CoWebsiteManager {
coWebsites.remove(coWebsite); coWebsites.remove(coWebsite);
coWebsites.add(coWebsite, 0); coWebsites.add(coWebsite, 0);
if (mainCoWebsite) {
const iframe = mainCoWebsite.getIframe();
if (iframe) {
iframe.style.display = "block";
}
}
if ( if (
isMediaBreakpointDown("lg") && isMediaBreakpointDown("lg") &&
get(embedScreenLayout) === LayoutMode.Presentation && get(embedScreenLayout) === LayoutMode.Presentation &&