mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-03 20:36:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #928 from matrix-org/luke/new-guest-access-inidicate-joining-early

Browse source 
Use RVS to indicate "joining" when setting a mxid
This commit is contained in:
Matthew Hodgson 2017-05-26 17:08:34 +01:00 committed by GitHub
commit fbc3f83625
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/components/structures/RoomView.js
View file

@ -671,10 +671,6 @@ module.exports = React.createClass({
// compatability workaround, let's not bother.
Rooms.setDMRoom(this.state.room.roomId, me.events.member.getSender()).done();
}
this.setState({
joining: false
});
}
}, 500),
@ -762,12 +758,22 @@ module.exports = React.createClass({
},
});
// Don't peek whilst registering otherwise getPendingEventList complains
// Do this by indicating our intention to join
dis.dispatch({
action: 'will_join',
});
const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog');
const close = Modal.createDialog(SetMxIdDialog, {
homeserverUrl: cli.getHomeserverUrl(),
onFinished: (submitted, credentials) => {
if (submitted) {
this.props.onRegistered(credentials);
} else {
dis.dispatch({
action: 'cancel_join',
});
}
},
onDifferentServerClicked: (ev) => {

11
src/stores/RoomViewStore.js
View file

@ -58,7 +58,16 @@ class RoomViewStore extends Store {
case 'view_room':
this._viewRoom(payload);
break;
case 'will_join':
this._setState({
joining: true,
});
break;
case 'cancel_join':
this._setState({
joining: false,
});
break;
// join_room:
// - opts: options for joinRoom
case 'join_room':