Compare commits

..

No commits in common. "auto_join" and "build_system2" have entirely different histories.

4 changed files with 37 additions and 21 deletions

View File

@ -240,7 +240,7 @@ const ChooseRoom = ({
</Button> </Button>
</DialogActions> </DialogActions>
{ !isElectron() && false && { !isElectron() &&
<CookieConsent buttonText={intl.formatMessage({ <CookieConsent buttonText={intl.formatMessage({
id : 'room.consentUnderstand', id : 'room.consentUnderstand',
defaultMessage : 'I understand' defaultMessage : 'I understand'

View File

@ -47,7 +47,7 @@ const styles = (theme) =>
}, },
divider : divider :
{ {
marginLeft : theme.spacing(3) marginLeft : theme.spacing(3),
}, },
show : show :
{ {
@ -345,7 +345,7 @@ const TopBar = (props) =>
className={classes.actionButton} className={classes.actionButton}
variant='contained' variant='contained'
color='secondary' color='secondary'
onClick={() => { roomClient.close(); window.close(); }} onClick={() => roomClient.close()}
> >
<FormattedMessage <FormattedMessage
id='label.leave' id='label.leave'

View File

@ -177,11 +177,27 @@ const JoinDialog = ({
{ {
const intl = useIntl(); const intl = useIntl();
roomClient.join({ roomId, joinVideo: true }); const handleKeyDown = (event) =>
{
const { key } = event;
return (<div />); switch (key)
{
case 'Enter':
case 'Escape':
{
if (displayName === '')
changeDisplayName('Guest');
if (room.inLobby)
roomClient.changeDisplayName(displayName);
break;
}
default:
break;
}
};
/* return ( return (
<div className={classes.root}> <div className={classes.root}>
<Dialog <Dialog
open open
@ -319,7 +335,7 @@ const JoinDialog = ({
</DialogContent> </DialogContent>
} }
{ !isElectron() && false && { !isElectron() &&
<CookieConsent buttonText={intl.formatMessage({ <CookieConsent buttonText={intl.formatMessage({
id : 'room.consentUnderstand', id : 'room.consentUnderstand',
defaultMessage : 'I understand' defaultMessage : 'I understand'
@ -332,7 +348,7 @@ const JoinDialog = ({
} }
</Dialog> </Dialog>
</div> </div>
);*/ );
}; };
JoinDialog.propTypes = JoinDialog.propTypes =

View File

@ -153,7 +153,7 @@ class Room extends React.PureComponent
return ( return (
<div className={classes.root}> <div className={classes.root}>
{ !isElectron() && false && { !isElectron() &&
<CookieConsent <CookieConsent
buttonText={ buttonText={
<FormattedMessage <FormattedMessage