imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display spinner not room preview after room create

Browse source 
After creating a room, display the activity spinner while we wait
for the room to come down the event stream.

This was the intention before but I can't see how it would have
worked: we were setting the 'joining' flag, but then resetting it
by claiming we were already joined in the view_room dispatch.

 * Send 'joining' instead of 'joined' in view_room dispatch, which
   will set the corresponding joining flag (ie. to indicate we've
   sent a request to join the room). Remove the 'joined' flag.
 * Reset 'joining' to false otherwise on a view_room dispatch to
   prevent it from leaking between rooms (this may have been the
   intention of the `if (payload.joined) newState.joining = false`?

Fixes https://github.com/vector-im/riot-web/issues/4701
This commit is contained in:
David Baker 2017-09-14 22:22:21 +01:00
parent 081a900524
commit 6b6e59e0dd
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/createRoom.js
View file

@ -79,12 +79,6 @@ function createRoom(opts) {
const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner'); const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
let roomId; let roomId;
if (opts.andView) {
// We will possibly have a successful join, indicate as such
dis.dispatch({
action: 'will_join',
});
}
return client.createRoom(createOpts).finally(function() { return client.createRoom(createOpts).finally(function() {
modal.close(); modal.close();
}).then(function(res) { }).then(function(res) {
@ -104,8 +98,10 @@ function createRoom(opts) {
action: 'view_room', action: 'view_room',
room_id: roomId, room_id: roomId,
should_peek: false, should_peek: false,
// Creating a room will have joined us to the room // Creating a room will have joined us to the room,
joined: true, // so we are expecting the room to come down the sync
// stream, if it hasn't already.
joining: true,
}); });
} }
return roomId; return roomId;

6
src/stores/RoomViewStore.js
View file

@ -119,12 +119,10 @@ class RoomViewStore extends Store {
roomLoadError: null, roomLoadError: null,
// should peek by default // should peek by default
shouldPeek: payload.should_peek === undefined ? true : payload.should_peek, shouldPeek: payload.should_peek === undefined ? true : payload.should_peek,
// have we sent a join request for this room and are waiting for a response?
joining: payload.joining || false,
}; };
if (payload.joined) {
newState.joining = false;
}
if (this._state.forwardingEvent) { if (this._state.forwardingEvent) {
dis.dispatch({ dis.dispatch({
action: 'send_event', action: 'send_event',