haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(prejoin) Fix roomname showing for 3rd party prejoin app (#12155) 

* fix(prejoin) Fix roomname showing for 3rd party prejoin app

* fix: Do not convert roomName to string when undefined.

Co-authored-by: damencho <damencho@jitsi.org>
This commit is contained in:
Horatiu Muresan 2022-09-09 20:10:50 +03:00 committed by GitHub
parent 8ce1423373
commit 6e1e6df952
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
react/features/base/conference/functions.js
View File

@ -192,7 +192,7 @@ export function getConferenceName(stateful: Function | Object): string {
|| subject || subject
|| callDisplayName || callDisplayName
|| (callee && callee.name) || (callee && callee.name)
|| safeStartCase(safeDecodeURIComponent(room)); || (room && safeStartCase(safeDecodeURIComponent(room)));
} }
/** /**

8
react/features/base/premeeting/components/web/PreMeetingScreen.js
View File

@ -161,9 +161,11 @@ class PreMeetingScreen extends PureComponent<Props> {
<h1 className = 'title'> <h1 className = 'title'>
{ title } { title }
</h1> </h1>
<span className = { classes.subtitle }> { _roomName && (
{_roomName} <span className = { classes.subtitle }>
</span> {_roomName}
</span>
)}
{ children } { children }
{ _buttons.length && <Toolbox toolbarButtons = { _buttons } /> } { _buttons.length && <Toolbox toolbarButtons = { _buttons } /> }
{ skipPrejoinButton } { skipPrejoinButton }