Merge branch 'develop' of github.com:thecodingmachine/workadventure

This commit is contained in:
_Bastler
2021-09-15 13:08:33 +02:00
3 changed files with 22 additions and 12 deletions
+5 -4
View File
@@ -1869,18 +1869,17 @@ export class GameScene extends DirtyScene {
mediaManager.hideGameOverlay();
//permit to stop jitsi when user close iframe
mediaManager.addTriggerCloseJitsiFrameButton("close-jisi", () => {
mediaManager.addTriggerCloseJitsiFrameButton("close-jitsi", () => {
this.stopJitsi();
});
}
public stopJitsi(): void {
this.connection?.setSilent(false);
const silent = this.gameMap.getCurrentProperties().get("silent");
this.connection?.setSilent(!!silent);
jitsiFactory.stop();
mediaManager.showGameOverlay();
mediaManager.removeTriggerCloseJitsiFrameButton('close-jisi');
const allProps = this.gameMap.getCurrentProperties();
if (allProps.get("jitsiRoom") === undefined) {
@@ -1911,6 +1910,8 @@ export class GameScene extends DirtyScene {
userInputManager: this.userInputManager,
});
}
mediaManager.removeTriggerCloseJitsiFrameButton("close-jitsi");
}
//todo: put this into an 'orchestrator' scene (EntryScene?)