Merge branch 'build_system2' into auto_join

Move to documentation IP range

app/src/components/ChooseRoom.js

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

app/src/components/Controls/TopBar.js

@@ -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()}
+						onClick={() => { roomClient.close(); window.close(); }}
 					>
 						<FormattedMessage
 							id='label.leave'
@@ -364,7 +364,7 @@ TopBar.propTypes =
 	room               : appPropTypes.Room.isRequired,
 	peersLength        : PropTypes.number,
 	lobbyPeers         : PropTypes.array,
-	permanentTopBar       : PropTypes.bool,
+	permanentTopBar    : PropTypes.bool,
 	myPicture          : PropTypes.string,
 	loggedIn           : PropTypes.bool.isRequired,
 	loginEnabled       : PropTypes.bool.isRequired,
@@ -383,14 +383,14 @@ TopBar.propTypes =
 
 const mapStateToProps = (state) =>
 	({
-		room         : state.room,
-		peersLength  : peersLengthSelector(state),
-		lobbyPeers   : lobbyPeersKeySelector(state),
+		room            : state.room,
+		peersLength     : peersLengthSelector(state),
+		lobbyPeers      : lobbyPeersKeySelector(state),
 		permanentTopBar : state.settings.permanentTopBar,
-		loggedIn     : state.me.loggedIn,
-		loginEnabled : state.me.loginEnabled,
-		myPicture    : state.me.picture,
-		unread       : state.toolarea.unreadMessages +
+		loggedIn        : state.me.loggedIn,
+		loginEnabled    : state.me.loginEnabled,
+		myPicture       : state.me.picture,
+		unread          : state.toolarea.unreadMessages +
 			state.toolarea.unreadFiles
 	});
 

app/src/components/JoinDialog.js

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

app/src/components/Room.js

@@ -153,17 +153,17 @@ class Room extends React.PureComponent
 
 		return (
 			<div className={classes.root}>
-				{ !isElectron() &&
+				{ !isElectron() && false &&
 					<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>