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

Merge pull request #8353 from Tainan404/dont-skip-preview

Browse Source 
Don't skip video preview if called via interface
This commit is contained in:
Anton Georgiev 2019-11-22 16:02:45 -05:00 committed by GitHub
commit 655bf800df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-html5/imports/ui/components/video-preview/container.jsx
View File

@ -13,7 +13,7 @@ const SKIP_VIDEO_PREVIEW = KURENTO_CONFIG.skipVideoPreview;
const VideoPreviewContainer = props => <VideoPreview {...props} />;
export default withModalMounter(withTracker(({ mountModal }) => ({
export default withModalMounter(withTracker(({ mountModal, fromInterface }) => ({
startSharing: () => {
mountModal(null);
VideoService.joinVideo();
@ -24,5 +24,5 @@ export default withModalMounter(withTracker(({ mountModal }) => ({
changeProfile: profileId => Service.changeProfile(profileId),
hasMediaDevices: deviceInfo.hasMediaDevices,
userParameterProfile: getFromUserSettings('bbb_preferred_camera_profile', (CAMERA_PROFILES.filter(i => i.default) || {}).id),
skipVideoPreview: getFromUserSettings('bbb_skip_video_preview', false) || SKIP_VIDEO_PREVIEW,
skipVideoPreview: (getFromUserSettings('bbb_skip_video_preview', false) || SKIP_VIDEO_PREVIEW) && !fromInterface,
}))(VideoPreviewContainer));

2
bigbluebutton-html5/imports/ui/components/video-provider/video-button/container.jsx
View File

@ -24,7 +24,7 @@ const JoinVideoOptionsContainer = (props) => {
...restProps
} = props;
const mountPreview = () => { mountModal(<VideoPreviewContainer />); };
const mountPreview = () => { mountModal(<VideoPreviewContainer fromInterface />); };
return !isMobileNative && (
<JoinVideoButton {...{