Merge pull request #8854 from KDSBrowne/issue-8852

Fix chat opening after saving application settings
This commit is contained in:
Anton Georgiev 2020-03-31 12:14:56 -04:00 committed by GitHub
commit 7b70831197
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -81,6 +81,16 @@ class Base extends Component {
if (animations) HTML.classList.add('animationsEnabled');
if (!animations) HTML.classList.add('animationsDisabled');
if (getFromUserSettings('bbb_show_participants_on_login', true) && !deviceInfo.type().isPhone) {
Session.set('openPanel', 'userlist');
if (CHAT_ENABLED) {
Session.set('openPanel', 'chat');
Session.set('idChatOpen', PUBLIC_CHAT_ID);
}
} else {
Session.set('openPanel', '');
}
fullscreenChangedEvents.forEach((event) => {
document.addEventListener(event, Base.handleFullscreenChange);
});
@ -354,16 +364,6 @@ const BaseContainer = withTracker(() => {
});
}
if (getFromUserSettings('bbb_show_participants_on_login', true) && !deviceInfo.type().isPhone) {
Session.set('openPanel', 'userlist');
if (CHAT_ENABLED) {
Session.set('openPanel', 'chat');
Session.set('idChatOpen', PUBLIC_CHAT_ID);
}
} else {
Session.set('openPanel', '');
}
return {
approved,
ejected,