Merge branch 'develop' of https://git.nr18.space/lbehm/workadventure into develop
This commit is contained in:
commit
8175106763
|
@ -12,6 +12,7 @@ import {CurrentGamerInterface, hasMovedEventName, Player} from "../Player/Player
|
|||
import {
|
||||
DEBUG_MODE,
|
||||
JITSI_PRIVATE_MODE,
|
||||
JITSI_URL,
|
||||
POSITION_DELAY,
|
||||
RESOLUTION,
|
||||
ZOOM_LEVEL
|
||||
|
@ -1206,7 +1207,8 @@ export class GameScene extends ResizableScene implements CenterListener {
|
|||
}
|
||||
|
||||
public startJitsi(roomName: string, jwt?: string): void {
|
||||
jitsiFactory.start(roomName, this.playerName, jwt);
|
||||
const jitsiUrl = getMapProperty(this.mapFile, 'jitsiUrl', 'string', JITSI_URL);
|
||||
jitsiFactory.start(jitsiUrl, roomName, this.playerName, jwt);
|
||||
this.connection.setSilent(true);
|
||||
mediaManager.hideGameOverlay();
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import {JITSI_URL} from "../Enum/EnvironmentVariable";
|
||||
import {mediaManager} from "./MediaManager";
|
||||
import {coWebsiteManager} from "./CoWebsiteManager";
|
||||
declare const window:any; // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
|
@ -30,9 +29,9 @@ class JitsiFactory {
|
|||
private audioCallback = this.onAudioChange.bind(this);
|
||||
private videoCallback = this.onVideoChange.bind(this);
|
||||
|
||||
public start(roomName: string, playerName:string, jwt?: string): void {
|
||||
public start(jitsiUrl: string, roomName: string, playerName:string, jwt?: string): void {
|
||||
coWebsiteManager.insertCoWebsite((cowebsiteDiv => {
|
||||
const domain = JITSI_URL;
|
||||
const domain = jitsiUrl;
|
||||
const options: any = { // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
roomName: roomName,
|
||||
jwt: jwt,
|
||||
|
@ -90,4 +89,4 @@ class JitsiFactory {
|
|||
|
||||
}
|
||||
|
||||
export const jitsiFactory = new JitsiFactory();
|
||||
export const jitsiFactory = new JitsiFactory();
|
||||
|
|
Loading…
Reference in a new issue