ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5896 from tsiegleauq/more-jitsi-cd

Browse Source 
More change detection in jitsi bar
This commit is contained in:
Emanuel Schütze 2021-02-15 14:50:09 +01:00 committed by GitHub
commit ef451afae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/app/shared/components/jitsi/jitsi.component.ts
View File

@ -371,15 +371,17 @@ export class JitsiComponent extends BaseViewComponentDirective implements OnInit
this.defaultRoomName = settings.JITSI_ROOM_NAME; this.defaultRoomName = settings.JITSI_ROOM_NAME;
this.roomPassword = settings.JITSI_ROOM_PASSWORD; this.roomPassword = settings.JITSI_ROOM_PASSWORD;
this.constantsLoaded.resolve(); this.constantsLoaded.resolve();
this.cd.markForCheck();
} }
}); });
await this.constantsLoaded; await this.constantsLoaded;
this.subscriptions.push( this.subscriptions.push(
this.configService this.configService.get<boolean>('general_system_conference_auto_connect').subscribe(autoconnect => {
.get<boolean>('general_system_conference_auto_connect') this.autoconnect = autoconnect;
.subscribe(autoconnect => (this.autoconnect = autoconnect)), this.cd.markForCheck();
}),
this.configService.get<boolean>('general_system_conference_show').subscribe(show => { this.configService.get<boolean>('general_system_conference_show').subscribe(show => {
this.enableJitsi = show && !!this.jitsiDomain && !!this.defaultRoomName; this.enableJitsi = show && !!this.jitsiDomain && !!this.defaultRoomName;
if (this.enableJitsi && this.autoconnect) { if (this.enableJitsi && this.autoconnect) {
@ -387,30 +389,38 @@ export class JitsiComponent extends BaseViewComponentDirective implements OnInit
} else { } else {
this.stopJitsi(); this.stopJitsi();
} }
this.cd.markForCheck();
}), }),
this.configService.get<boolean>('general_system_conference_los_restriction').subscribe(restricted => { this.configService.get<boolean>('general_system_conference_los_restriction').subscribe(restricted => {
this.restricted = restricted; this.restricted = restricted;
this.cd.markForCheck();
}), }),
this.configService this.configService
.get<number>('general_system_conference_auto_connect_next_speakers') .get<number>('general_system_conference_auto_connect_next_speakers')
.subscribe(nextSpeakerAmount => { .subscribe(nextSpeakerAmount => {
this.nextSpeakerAmount = nextSpeakerAmount; this.nextSpeakerAmount = nextSpeakerAmount;
this.cd.markForCheck();
}), }),
this.configService.get<string>('general_system_stream_url').subscribe(url => { this.configService.get<string>('general_system_stream_url').subscribe(url => {
this.onLiveStreamAvailable(url); this.onLiveStreamAvailable(url);
this.configsLoaded.resolve(); this.configsLoaded.resolve();
this.cd.markForCheck();
}), }),
this.configService.get<boolean>('general_system_conference_open_microphone').subscribe(open => { this.configService.get<boolean>('general_system_conference_open_microphone').subscribe(open => {
this.configOverwrite.startWithAudioMuted = !open; this.configOverwrite.startWithAudioMuted = !open;
this.cd.markForCheck();
}), }),
this.configService.get<boolean>('general_system_conference_open_video').subscribe(open => { this.configService.get<boolean>('general_system_conference_open_video').subscribe(open => {
this.configOverwrite.startWithVideoMuted = !open; this.configOverwrite.startWithVideoMuted = !open;
this.cd.markForCheck();
}), }),
this.configService.get<boolean>('general_system_applause_enable').subscribe(enable => { this.configService.get<boolean>('general_system_applause_enable').subscribe(enable => {
this.showApplause = enable; this.showApplause = enable;
this.cd.markForCheck();
}), }),
this.configService.get<number>('general_system_stream_applause_timeout').subscribe(timeout => { this.configService.get<number>('general_system_stream_applause_timeout').subscribe(timeout => {
this.applauseTimeout = (timeout || 1) * 1000; this.applauseTimeout = (timeout || 1) * 1000;
this.cd.markForCheck();
}), }),
this.configService.get<boolean>('general_system_applause_show_level').subscribe(show => { this.configService.get<boolean>('general_system_applause_show_level').subscribe(show => {
this.showApplauseLevel = show; this.showApplauseLevel = show;
@ -422,9 +432,11 @@ export class JitsiComponent extends BaseViewComponentDirective implements OnInit
} else { } else {
this.isApplausBarUsed = false; this.isApplausBarUsed = false;
} }
this.cd.markForCheck();
}), }),
this.configService.get<boolean>('general_system_conference_enable_helpdesk').subscribe(enabled => { this.configService.get<boolean>('general_system_conference_enable_helpdesk').subscribe(enabled => {
this.isSupportEnabled = enabled; this.isSupportEnabled = enabled;
this.cd.markForCheck();
}) })
); );
@ -451,6 +463,7 @@ export class JitsiComponent extends BaseViewComponentDirective implements OnInit
public toggleMute(): void { public toggleMute(): void {
if (this.isJitsiActive) { if (this.isJitsiActive) {
this.api.executeCommand('toggleAudio'); this.api.executeCommand('toggleAudio');
this.cd.markForCheck();
} }
} }