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

Merge pull request #929 from matrix-org/luke/new-guest-access-fix-view-next-room

Browse source 
Fix view_next_room, view_previous_room and view_indexed_room
This commit is contained in:
Matthew Hodgson 2017-05-26 17:09:35 +01:00 committed by GitHub
commit 1c7785535f
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/structures/MatrixChat.js
View file

@ -554,6 +554,7 @@ module.exports = React.createClass({
this.notifyNewScreen('register'); this.notifyNewScreen('register');
}, },
// TODO: Move to RoomViewStore
_viewNextRoom: function(roomIndexDelta) { _viewNextRoom: function(roomIndexDelta) {
const allRooms = RoomListSorter.mostRecentActivityFirst( const allRooms = RoomListSorter.mostRecentActivityFirst(
MatrixClientPeg.get().getRooms(), MatrixClientPeg.get().getRooms(),
@ -567,15 +568,22 @@ module.exports = React.createClass({
} }
roomIndex = (roomIndex + roomIndexDelta) % allRooms.length; roomIndex = (roomIndex + roomIndexDelta) % allRooms.length;
if (roomIndex < 0) roomIndex = allRooms.length - 1; if (roomIndex < 0) roomIndex = allRooms.length - 1;
this._viewRoom({ room_id: allRooms[roomIndex].roomId }); dis.dispatch({
action: 'view_room',
room_id: allRooms[roomIndex].roomId,
});
}, },
// TODO: Move to RoomViewStore
_viewIndexedRoom: function(roomIndex) { _viewIndexedRoom: function(roomIndex) {
const allRooms = RoomListSorter.mostRecentActivityFirst( const allRooms = RoomListSorter.mostRecentActivityFirst(
MatrixClientPeg.get().getRooms(), MatrixClientPeg.get().getRooms(),
); );
if (allRooms[roomIndex]) { if (allRooms[roomIndex]) {
this._viewRoom({ room_id: allRooms[roomIndex].roomId }); dis.dispatch({
action: 'view_room',
room_id: allRooms[roomIndex].roomId,
});
} }
}, },