OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-09-05 07:15:32 +00:00
parent 562cc32860 e5b761b754
commit 4de7c466d0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/GroupView.js
View File

@ -723,6 +723,11 @@ export default React.createClass({
}, },
_onJoinClick: async function() { _onJoinClick: async function() {
if (this._matrixClient.isGuest()) {
dis.dispatch({action: 'view_set_mxid'});
return;
}
this.setState({membershipBusy: true}); this.setState({membershipBusy: true});
// Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the