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

Merge pull request #1639 from vector-im/dbkr/fix_peeking 

Update for react-sdk dbkr/fix_peeking branch
pull/1660/head
Richard van der Hoff 2016-06-16 11:13:29 +01:00 committed by GitHub
parent d38c338f89 3547bd8d00
commit 4cfcdfa040
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/structures/RoomDirectory.js
View File

@ -116,16 +116,20 @@ module.exports = React.createClass({
}; };
} }
// It's not really possible to join Matrix rooms by ID because the HS has no way to know var payload = {
// which servers to start querying. However, there's no other way to join rooms in
// this list without aliases at present, so if roomAlias isn't set here we'll rely
// on view_room falling back to using the ID
dis.dispatch({
oob_data: oob_data, oob_data: oob_data,
action: 'view_room', action: 'view_room',
room_id: roomId, };
room_alias: roomAlias, // It's not really possible to join Matrix rooms by ID because the HS has no way to know
}); // which servers to start querying. However, there's no other way to join rooms in
// this list without aliases at present, so if roomAlias isn't set here we have no
// choice but to supply the ID.
if (roomAlias) {
payload.room_alias = roomAlias;
} else {
payload.room_id = roomId;
}
dis.dispatch(payload);
}, },
getRows: function(filter) { getRows: function(filter) {