fix: Hides pre join screen in few login window cases.
In Firefox pre-join was grabbing the focus and yuo cannot type username and password after clicking I'm the host button.
This commit is contained in:
parent
38b21e986d
commit
f613126776
|
@ -20,7 +20,10 @@ import {
|
||||||
import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions';
|
import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions';
|
||||||
import { getCustomerDetails } from './react/features/jaas/actions.any';
|
import { getCustomerDetails } from './react/features/jaas/actions.any';
|
||||||
import { isVpaasMeeting, getJaasJWT } from './react/features/jaas/functions';
|
import { isVpaasMeeting, getJaasJWT } from './react/features/jaas/functions';
|
||||||
import { setPrejoinDisplayNameRequired } from './react/features/prejoin/actions';
|
import {
|
||||||
|
setPrejoinDisplayNameRequired,
|
||||||
|
setPrejoinPageVisibility
|
||||||
|
} from './react/features/prejoin/actions';
|
||||||
const logger = Logger.getLogger(__filename);
|
const logger = Logger.getLogger(__filename);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -244,6 +247,7 @@ function requestAuth(roomName) {
|
||||||
resolve(connection);
|
resolve(connection);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
APP.store.dispatch(setPrejoinPageVisibility(false));
|
||||||
APP.store.dispatch(
|
APP.store.dispatch(
|
||||||
openDialog(LoginDialog, { onSuccess,
|
openDialog(LoginDialog, { onSuccess,
|
||||||
roomName })
|
roomName })
|
||||||
|
|
|
@ -17,6 +17,7 @@ import {
|
||||||
import { getReplaceParticipant } from '../../../react/features/base/config/functions';
|
import { getReplaceParticipant } from '../../../react/features/base/config/functions';
|
||||||
import { isDialogOpen } from '../../../react/features/base/dialog';
|
import { isDialogOpen } from '../../../react/features/base/dialog';
|
||||||
import { setJWT } from '../../../react/features/base/jwt';
|
import { setJWT } from '../../../react/features/base/jwt';
|
||||||
|
import { setPrejoinPageVisibility } from '../../../react/features/prejoin';
|
||||||
import UIUtil from '../util/UIUtil';
|
import UIUtil from '../util/UIUtil';
|
||||||
|
|
||||||
import ExternalLoginDialog from './LoginDialog';
|
import ExternalLoginDialog from './LoginDialog';
|
||||||
|
@ -180,6 +181,7 @@ function authenticate(room: Object, lockPassword: string) {
|
||||||
if (isTokenAuthEnabled(config) || room.isExternalAuthEnabled()) {
|
if (isTokenAuthEnabled(config) || room.isExternalAuthEnabled()) {
|
||||||
doExternalAuth(room, lockPassword);
|
doExternalAuth(room, lockPassword);
|
||||||
} else {
|
} else {
|
||||||
|
APP.store.dispatch(setPrejoinPageVisibility(false));
|
||||||
APP.store.dispatch(openLoginDialog());
|
APP.store.dispatch(openLoginDialog());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@ import {
|
||||||
JitsiConnectionErrors
|
JitsiConnectionErrors
|
||||||
} from '../base/lib-jitsi-meet';
|
} from '../base/lib-jitsi-meet';
|
||||||
import { MiddlewareRegistry } from '../base/redux';
|
import { MiddlewareRegistry } from '../base/redux';
|
||||||
|
import { setPrejoinPageVisibility } from '../prejoin';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CANCEL_LOGIN,
|
CANCEL_LOGIN,
|
||||||
|
@ -120,6 +121,7 @@ MiddlewareRegistry.register(store => next => action => {
|
||||||
&& error.name === JitsiConnectionErrors.PASSWORD_REQUIRED
|
&& error.name === JitsiConnectionErrors.PASSWORD_REQUIRED
|
||||||
&& typeof error.recoverable === 'undefined') {
|
&& typeof error.recoverable === 'undefined') {
|
||||||
error.recoverable = true;
|
error.recoverable = true;
|
||||||
|
store.dispatch(setPrejoinPageVisibility(false));
|
||||||
store.dispatch(openLoginDialog());
|
store.dispatch(openLoginDialog());
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue