BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow autoShareWebcam even when autoJoin is disabled

Browse Source 
close #7902
This commit is contained in:
Joao Siebel 2019-08-22 17:08:24 -03:00
parent 750136609a
commit 7603c78740
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bigbluebutton-html5/imports/ui/components/audio/container.jsx
View File

@ -1,4 +1,4 @@
import React from 'react';
import React, { PureComponent } from 'react';
import { withTracker } from 'meteor/react-meteor-data';
import { Session } from 'meteor/session';
import { withModalMounter } from '/imports/ui/components/modal/service';
@ -59,8 +59,7 @@ const intlMessages = defineMessages({
},
});
class AudioContainer extends React.Component {
class AudioContainer extends PureComponent {
constructor(props) {
super(props);
@ -139,10 +138,15 @@ export default lockContextContainer(withModalMounter(injectIntl(withTracker(({ m
init: () => {
Service.init(messages, intl);
Service.changeOutputDevice(document.querySelector('#remote-media').sinkId);
if (!autoJoin || didMountAutoJoin) return;
Session.set('audioModalIsOpen', true);
const enableVideo = getFromUserSettings('enableVideo', KURENTO_CONFIG.enableVideo);
const autoShareWebcam = getFromUserSettings('autoShareWebcam', KURENTO_CONFIG.autoShareWebcam);
if (!autoJoin || didMountAutoJoin) {
if (enableVideo && autoShareWebcam) {
openVideoPreviewModal();
}
return;
}
Session.set('audioModalIsOpen', true);
if (enableVideo && autoShareWebcam) {
openAudioModal().then(() => { openVideoPreviewModal(); didMountAutoJoin = true; });
} else {