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

Merge pull request #17669 from bigbluebutton/revert-17512-I-17464

Browse Source 
Revert "Fix: Presentation un-minimizing when exiting external video or screen sharing."
This commit is contained in:
Anton Georgiev 2023-04-18 17:21:16 -04:00 committed by GitHub
commit ccf79f3bf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
View File

@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl';
import Button from '/imports/ui/components/common/button/component';
const propTypes = {
intl: PropTypes.shape({
formatMessage: PropTypes.func.isRequired,
@ -48,8 +47,7 @@ const PresentationOptionsContainer = ({
buttonType = 'desktop';
}
const isThereCurrentPresentation = hasExternalVideo || hasScreenshare
|| hasPresentation || hasPinnedSharedNotes;
const isThereCurrentPresentation = hasExternalVideo || hasScreenshare || hasPresentation || hasPinnedSharedNotes;
return (
<Button
icon={`${buttonType}${!presentationIsOpen ? '_off' : ''}`}
@ -61,12 +59,7 @@ const PresentationOptionsContainer = ({
hideLabel
circle
size="lg"
onClick={() => {
setPresentationIsOpen(layoutContextDispatch, !presentationIsOpen);
if (!hasExternalVideo && !hasScreenshare && !hasPinnedSharedNotes) {
Session.set('presentationLastState', !presentationIsOpen);
}
}}
onClick={() => setPresentationIsOpen(layoutContextDispatch, !presentationIsOpen)}
id="restore-presentation"
ghost={!presentationIsOpen}
disabled={!isThereCurrentPresentation}

4
bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
View File

@ -231,10 +231,6 @@ class VideoPlayer extends Component {
type: ACTIONS.SET_HAS_EXTERNAL_VIDEO,
value: false,
});
layoutContextDispatch({
type: ACTIONS.SET_PRESENTATION_IS_OPEN,
value: Session.get('presentationLastState'),
});
if (hidePresentationOnJoin) {
layoutContextDispatch({

4
bigbluebutton-html5/imports/ui/components/notes/component.jsx
View File

@ -136,10 +136,6 @@ const Notes = ({
type: ACTIONS.SET_NOTES_IS_PINNED,
value: false,
});
layoutContextDispatch({
type: ACTIONS.SET_PRESENTATION_IS_OPEN,
value: Session.get('presentationLastState'),
});
};
}
}, []);

4
bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
View File

@ -182,10 +182,6 @@ class ScreenshareComponent extends React.Component {
}
this.clearMediaFlowingMonitor();
layoutContextDispatch({
type: ACTIONS.SET_PRESENTATION_IS_OPEN,
value: Session.get('presentationLastState'),
});
}
clearMediaFlowingMonitor() {