TT#66575 Conferencing: Join possible without media enabled

- microphone enabled before join method (chained)
- removed .ngcpcfg_perms from commit (involuntarily added)
- Change join button color to primary permanently

Change-Id: I3b27eb72a2ff6dccb1a3ac19cd3303b84180216c
changes/51/33551/7
Carlo Venusino 6 years ago committed by Hans-Peter Herzog
parent 617e13f6b8
commit 2dc660e887

@ -188,8 +188,9 @@
this.$store.dispatch('conference/toggleScreen'); this.$store.dispatch('conference/toggleScreen');
} }
}, },
join(conferenceId) { async join(conferenceId) {
if(this.hasConferenceId) { if(this.hasConferenceId) {
await this.$store.dispatch('conference/enableMicrophone');
this.$store.dispatch('conference/join', conferenceId); this.$store.dispatch('conference/join', conferenceId);
} }
}, },

@ -31,7 +31,7 @@
<q-btn <q-btn
class="csc-button" class="csc-button"
:color="joinButtonColor" :color="joinButtonColor"
:disable="!(isMediaEnabled && hasConferenceId) || isJoining" :disable="!hasConferenceId || isJoining"
icon="call" icon="call"
round round
@click="join" @click="join"
@ -92,12 +92,7 @@
return classes; return classes;
}, },
joinButtonColor() { joinButtonColor() {
if(this.isMediaEnabled && this.hasConferenceId) { return 'primary';
return 'primary';
}
else {
return 'grey';
}
}, },
shareButtonColor() { shareButtonColor() {
if(this.hasConferenceId) { if(this.hasConferenceId) {

@ -187,7 +187,7 @@ export default {
break; break;
} }
let localMediaStream; let localMediaStream;
media.build().then(($localMediaStream)=>{ return media.build().then(($localMediaStream)=>{
localMediaStream = $localMediaStream; localMediaStream = $localMediaStream;
localMediaStream.onVideoEnded(()=>{ localMediaStream.onVideoEnded(()=>{
context.dispatch('createLocalMedia', MediaTypes.mic); context.dispatch('createLocalMedia', MediaTypes.mic);
@ -237,7 +237,7 @@ export default {
} }
}); });
}, },
enableMicrophone(context) { async enableMicrophone(context) {
if(!context.getters.isLocalMediaRequesting) { if(!context.getters.isLocalMediaRequesting) {
let mediaType = MediaTypes.mic; let mediaType = MediaTypes.mic;
if(context.getters.isCameraEnabled) { if(context.getters.isCameraEnabled) {
@ -246,7 +246,7 @@ export default {
else if(context.getters.isScreenEnabled) { else if(context.getters.isScreenEnabled) {
mediaType = MediaTypes.micScreen; mediaType = MediaTypes.micScreen;
} }
context.dispatch('createLocalMedia', mediaType); await context.dispatch('createLocalMedia', mediaType);
} }
}, },
disableMicrophone(context) { disableMicrophone(context) {

Loading…
Cancel
Save