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>
</DialogActions>
{ !isElectron() && false &&
{ !isElectron() &&
<CookieConsent buttonText={intl.formatMessage({
id : 'room.consentUnderstand',
defaultMessage : 'I understand'

View File

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

View File

@ -177,11 +177,27 @@ const JoinDialog = ({
{
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}>
<Dialog
open
@ -319,7 +335,7 @@ const JoinDialog = ({
</DialogContent>
}
{ !isElectron() && false &&
{ !isElectron() &&
<CookieConsent buttonText={intl.formatMessage({
id : 'room.consentUnderstand',
defaultMessage : 'I understand'
@ -332,7 +348,7 @@ const JoinDialog = ({
}
</Dialog>
</div>
);*/
);
};
JoinDialog.propTypes =

View File

@ -153,17 +153,17 @@ class Room extends React.PureComponent
return (
<div className={classes.root}>
{ !isElectron() && false &&
{ !isElectron() &&
<CookieConsent
buttonText={
<FormattedMessage
id='room.consentUnderstand'
defaultMessage='I understand'
id = 'room.consentUnderstand'
defaultMessage = 'I understand'
/>
}
>
<FormattedMessage
id='room.cookieConsent'
id = 'room.cookieConsent'
defaultMessage='This website uses cookies to enhance the user experience'
/>
</CookieConsent>