From 666b6df5884568682b9297f50152f63317248e67 Mon Sep 17 00:00:00 2001 From: Alexis Faizeau Date: Thu, 10 Feb 2022 15:37:04 +0100 Subject: [PATCH] Fix Jitsi co-website reloading --- front/src/Phaser/Game/GameScene.ts | 6 +++--- front/src/WebRtc/CoWebsite/JitsiCoWebsite.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index 443a6256..2f661320 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -2156,9 +2156,9 @@ ${escapedMessage} ); const jitsiUrl = allProps.get(GameMapProperties.JITSI_URL) as string | undefined; - coWebsite.setJitsiLoadPromise( - jitsiFactory.start(roomName, this.playerName, jwt, jitsiConfig, jitsiInterfaceConfig, jitsiUrl) - ); + coWebsite.setJitsiLoadPromise(() => { + return jitsiFactory.start(roomName, this.playerName, jwt, jitsiConfig, jitsiInterfaceConfig, jitsiUrl); + }); coWebsiteManager.loadCoWebsite(coWebsite).catch((err) => { console.error(err); diff --git a/front/src/WebRtc/CoWebsite/JitsiCoWebsite.ts b/front/src/WebRtc/CoWebsite/JitsiCoWebsite.ts index 66491569..654bb924 100644 --- a/front/src/WebRtc/CoWebsite/JitsiCoWebsite.ts +++ b/front/src/WebRtc/CoWebsite/JitsiCoWebsite.ts @@ -5,7 +5,7 @@ import { jitsiFactory } from "../JitsiFactory"; import { SimpleCoWebsite } from "./SimpleCoWebsite"; export class JitsiCoWebsite extends SimpleCoWebsite { - private jitsiLoadPromise?: CancelablePromise; + private jitsiLoadPromise?: () => CancelablePromise; constructor(url: URL, allowApi?: boolean, allowPolicy?: string, widthPercent?: number, closable?: boolean) { const coWebsite = coWebsiteManager.searchJitsi(); @@ -17,7 +17,7 @@ export class JitsiCoWebsite extends SimpleCoWebsite { super(url, allowApi, allowPolicy, widthPercent, closable); } - setJitsiLoadPromise(promise: CancelablePromise): void { + setJitsiLoadPromise(promise: () => CancelablePromise): void { this.jitsiLoadPromise = promise; } @@ -32,7 +32,7 @@ export class JitsiCoWebsite extends SimpleCoWebsite { return reject("Undefined Jitsi start callback"); } - const jitsiLoading = this.jitsiLoadPromise + const jitsiLoading = this.jitsiLoadPromise() .then((iframe) => { this.iframe = iframe; this.iframe.classList.add("pixel");