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

Fixed display name.

master
Håvar Aambø Fosstveit 2019-10-24 12:53:44 +02:00
parent f38c5e38c5
commit 01ea8b05d5
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/RoomClient.js
View File

@ -418,6 +418,9 @@ export default class RoomClient
{ {
logger.debug('changeDisplayName() [displayName:"%s"]', displayName); logger.debug('changeDisplayName() [displayName:"%s"]', displayName);
if (!displayName)
displayName = 'Guest';
try try
{ {
await this.sendRequest('changeDisplayName', { displayName }); await this.sendRequest('changeDisplayName', { displayName });

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

@ -1,4 +1,4 @@
import React, { useState } from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { withStyles } from '@material-ui/core/styles'; import { withStyles } from '@material-ui/core/styles';
import { withRoomContext } from '../RoomContext'; import { withRoomContext } from '../RoomContext';
@ -158,7 +158,7 @@ JoinDialog.propTypes =
{ {
roomClient : PropTypes.any.isRequired, roomClient : PropTypes.any.isRequired,
displayName : PropTypes.string.isRequired, displayName : PropTypes.string.isRequired,
loginEnabled : PropTypes.string.isRequired, loginEnabled : PropTypes.bool.isRequired,
changeDisplayName : PropTypes.func.isRequired, changeDisplayName : PropTypes.func.isRequired,
classes : PropTypes.object.isRequired classes : PropTypes.object.isRequired
}; };

4
app/src/components/Lobby.js
View File

@ -1,4 +1,4 @@
import React, { useState } from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { withStyles } from '@material-ui/core/styles'; import { withStyles } from '@material-ui/core/styles';
import { withRoomContext } from '../RoomContext'; import { withRoomContext } from '../RoomContext';
@ -139,7 +139,7 @@ Lobby.propTypes =
roomClient : PropTypes.any.isRequired, roomClient : PropTypes.any.isRequired,
url : PropTypes.string.isRequired, url : PropTypes.string.isRequired,
displayName : PropTypes.string.isRequired, displayName : PropTypes.string.isRequired,
loginEnabled : PropTypes.string.isRequired, loginEnabled : PropTypes.bool.isRequired,
changeDisplayName : PropTypes.func.isRequired, changeDisplayName : PropTypes.func.isRequired,
classes : PropTypes.object.isRequired classes : PropTypes.object.isRequired
}; };

6
app/src/reducers/settings.js
View File

@ -24,11 +24,7 @@ const settings = (state = initialState, action) =>
case 'SET_DISPLAY_NAME': case 'SET_DISPLAY_NAME':
{ {
let { displayName } = action.payload; const { displayName } = action.payload;
// Be ready for undefined displayName (so keep previous one).
if (!displayName)
displayName = state.displayName;
return { ...state, displayName }; return { ...state, displayName };
} }