Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small fix to join dialog.

master
Håvar Aambø Fosstveit 2019-11-04 23:30:22 +01:00
parent 98caed6e4a
commit d9e712ec04
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/components/JoinDialog.js
View File

@ -160,6 +160,7 @@ const JoinDialog = ({
roomClient, roomClient,
room, room,
displayName, displayName,
displayNameInProgress,
loggedIn, loggedIn,
myPicture, myPicture,
changeDisplayName, changeDisplayName,
@ -177,6 +178,8 @@ const JoinDialog = ({
{ {
if (displayName === '') if (displayName === '')
changeDisplayName('Guest'); changeDisplayName('Guest');
if (room.inLobby)
roomClient.changeDisplayName(displayName);
break; break;
} }
default: default:
@ -222,6 +225,7 @@ const JoinDialog = ({
value={displayName} value={displayName}
variant='outlined' variant='outlined'
margin='normal' margin='normal'
disabled={displayNameInProgress}
onChange={(event) => onChange={(event) =>
{ {
const { value } = event.target; const { value } = event.target;
@ -233,7 +237,8 @@ const JoinDialog = ({
{ {
if (displayName === '') if (displayName === '')
changeDisplayName('Guest'); changeDisplayName('Guest');
if (room.inLobby) roomClient.changeDisplayName(displayName); if (room.inLobby)
roomClient.changeDisplayName(displayName);
}} }}
fullWidth fullWidth
/> />
@ -296,24 +301,26 @@ const JoinDialog = ({
JoinDialog.propTypes = JoinDialog.propTypes =
{ {
roomClient : PropTypes.any.isRequired, roomClient : PropTypes.any.isRequired,
room : PropTypes.object.isRequired, room : PropTypes.object.isRequired,
displayName : PropTypes.string.isRequired, displayName : PropTypes.string.isRequired,
loginEnabled : PropTypes.bool.isRequired, displayNameInProgress : PropTypes.bool.isRequired,
loggedIn : PropTypes.bool.isRequired, loginEnabled : PropTypes.bool.isRequired,
myPicture : PropTypes.string, loggedIn : PropTypes.bool.isRequired,
changeDisplayName : PropTypes.func.isRequired, myPicture : PropTypes.string,
classes : PropTypes.object.isRequired changeDisplayName : PropTypes.func.isRequired,
classes : PropTypes.object.isRequired
}; };
const mapStateToProps = (state) => const mapStateToProps = (state) =>
{ {
return { return {
room : state.room, room : state.room,
displayName : state.settings.displayName, displayName : state.settings.displayName,
loginEnabled : state.me.loginEnabled, displayNameInProgress : state.me.displayNameInProgress,
loggedIn : state.me.loggedIn, loginEnabled : state.me.loginEnabled,
myPicture : state.me.picture loggedIn : state.me.loggedIn,
myPicture : state.me.picture
}; };
}; };
@ -338,6 +345,7 @@ export default withRoomContext(connect(
prev.room.inLobby === next.room.inLobby && prev.room.inLobby === next.room.inLobby &&
prev.room.signInRequired === next.room.signInRequired && prev.room.signInRequired === next.room.signInRequired &&
prev.settings.displayName === next.settings.displayName && prev.settings.displayName === next.settings.displayName &&
prev.me.displayNameInProgress === next.me.displayNameInProgress &&
prev.me.loginEnabled === next.me.loginEnabled && prev.me.loginEnabled === next.me.loginEnabled &&
prev.me.loggedIn === next.me.loggedIn && prev.me.loggedIn === next.me.loggedIn &&
prev.me.picture === next.me.picture prev.me.picture === next.me.picture