noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #259 from thecodingmachine/develop

Browse Source 
Hiding cam details when entering a Jisti room (prod)
This commit is contained in:
David Négrier 2020-09-02 09:05:23 +02:00 committed by GitHub
commit 2e2e50f7c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
front/src/Phaser/Game/GameScene.ts
View File

@ -30,6 +30,7 @@ import GameObject = Phaser.GameObjects.GameObject;
import FILE_LOAD_ERROR = Phaser.Loader.Events.FILE_LOAD_ERROR; import FILE_LOAD_ERROR = Phaser.Loader.Events.FILE_LOAD_ERROR;
import {GameMap} from "./GameMap"; import {GameMap} from "./GameMap";
import {CoWebsiteManager} from "../../WebRtc/CoWebsiteManager"; import {CoWebsiteManager} from "../../WebRtc/CoWebsiteManager";
import {mediaManager} from "../../WebRtc/MediaManager";
export enum Textures { export enum Textures {
@ -429,6 +430,7 @@ export class GameScene extends Phaser.Scene implements CenterListener {
this.connection.setSilent(false); this.connection.setSilent(false);
jitsiApi?.dispose(); jitsiApi?.dispose();
CoWebsiteManager.closeCoWebsite(); CoWebsiteManager.closeCoWebsite();
mediaManager.showGameOverlay();
} else { } else {
CoWebsiteManager.insertCoWebsite((cowebsiteDiv => { CoWebsiteManager.insertCoWebsite((cowebsiteDiv => {
const domain = JITSI_URL; const domain = JITSI_URL;
@ -449,6 +451,7 @@ export class GameScene extends Phaser.Scene implements CenterListener {
jitsiApi.executeCommand('displayName', gameManager.getPlayerName()); jitsiApi.executeCommand('displayName', gameManager.getPlayerName());
})); }));
this.connection.setSilent(true); this.connection.setSilent(true);
mediaManager.hideGameOverlay();
} }
}) })

5
front/src/WebRtc/MediaManager.ts
View File

@ -132,6 +132,11 @@ export class MediaManager {
gameOverlay.classList.add('active'); gameOverlay.classList.add('active');
} }
public hideGameOverlay(){
const gameOverlay = this.getElementByIdOrFail('game-overlay');
gameOverlay.classList.remove('active');
}
private enableCamera() { private enableCamera() {
this.cinemaClose.style.display = "none"; this.cinemaClose.style.display = "none";
this.cinemaBtn.classList.remove("disabled"); this.cinemaBtn.classList.remove("disabled");