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

Merge pull request #14771 from ramonlsouza/issue-14766

Browse Source 
fix: "Autoswaplayout: true" doesn't work as expected
This commit is contained in:
Anton Georgiev 2022-04-07 13:39:34 -04:00 committed by GitHub
commit 72f1b66e6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-html5/imports/ui/components/app/component.jsx
View File

@ -154,6 +154,7 @@ class App extends Component {
settingsLayout, settingsLayout,
isRTL, isRTL,
hidePresentation, hidePresentation,
autoSwapLayout,
} = this.props; } = this.props;
const { browserName } = browserInfo; const { browserName } = browserInfo;
const { osName } = deviceInfo; const { osName } = deviceInfo;
@ -167,7 +168,7 @@ class App extends Component {
layoutContextDispatch({ layoutContextDispatch({
type: ACTIONS.SET_PRESENTATION_IS_OPEN, type: ACTIONS.SET_PRESENTATION_IS_OPEN,
value: !hidePresentation, value: !(autoSwapLayout || hidePresentation),
}); });
Modal.setAppElement('#app'); Modal.setAppElement('#app');

1
bigbluebutton-html5/imports/ui/components/app/container.jsx
View File

@ -231,6 +231,7 @@ export default injectIntl(withModalMounter(withTracker(({ intl, baseControls })
Meteor.settings.public.presentation.restoreOnUpdate, Meteor.settings.public.presentation.restoreOnUpdate,
), ),
hidePresentation: getFromUserSettings('bbb_hide_presentation', LAYOUT_CONFIG.hidePresentation), hidePresentation: getFromUserSettings('bbb_hide_presentation', LAYOUT_CONFIG.hidePresentation),
autoSwapLayout: getFromUserSettings('bbb_auto_swap_layout', LAYOUT_CONFIG.autoSwapLayout),
hideActionsBar: getFromUserSettings('bbb_hide_actions_bar', false), hideActionsBar: getFromUserSettings('bbb_hide_actions_bar', false),
isModalOpen: !!getModal(), isModalOpen: !!getModal(),
}; };