From 368ef9e8e89b0e75c26e4912049002d4558a495f Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 22 Nov 2018 18:57:07 +0000 Subject: [PATCH] hack so we don't revert to single room view when viewing grid --- src/stores/OpenRoomsStore.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/stores/OpenRoomsStore.js b/src/stores/OpenRoomsStore.js index f67108d35a..764f54d7c2 100644 --- a/src/stores/OpenRoomsStore.js +++ b/src/stores/OpenRoomsStore.js @@ -102,10 +102,15 @@ class OpenRoomsStore extends Store { const dispatcher = new MatrixDispatcher(); // forward all actions coming from the room dispatcher // to the global one - const dispatcherRef = dispatcher.register((action) => { - action.grid_src_room_id = room_id; - action.grid_src_room_alias = room_alias; - this.getDispatcher().dispatch(action); + const dispatcherRef = dispatcher.register((payload) => { + // block a view_room action for the same room because it will switch to + // single room mode in MatrixChat + if (payload.action === 'view_room' && room_id === payload.room_id) { + return; + } + payload.grid_src_room_id = room_id; + payload.grid_src_room_alias = room_alias; + this.getDispatcher().dispatch(payload); }); const openRoom = { store: new RoomViewStore(dispatcher),