Fix joining rooms by typing the alias
Fixes regression introduced by https://github.com/vector-im/vector-web/pull/1680
This commit is contained in:
parent
c12839dc7b
commit
d45e44d01c
1 changed files with 36 additions and 26 deletions
|
@ -126,14 +126,26 @@ module.exports = React.createClass({
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
showRoom: function(room, ev) {
|
onRoomClicked: function(room, ev) {
|
||||||
if (ev.shiftKey) {
|
if (ev.shiftKey) {
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
this.removeFromDirectory(room);
|
this.removeFromDirectory(room);
|
||||||
return;
|
} else {
|
||||||
|
this.showRoom(room);
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
showRoomAlias: function(alias) {
|
||||||
|
this.showRoom(null, alias);
|
||||||
|
},
|
||||||
|
|
||||||
|
showRoom: function(room, room_alias) {
|
||||||
var oob_data = {};
|
var oob_data = {};
|
||||||
|
var payload = {action: 'view_room'};
|
||||||
|
if (room) {
|
||||||
|
// Don't let the user view a room they won't be able to either
|
||||||
|
// peek or join: fail earlier so they don't have to click back
|
||||||
|
// to the directory.
|
||||||
if (MatrixClientPeg.get().isGuest()) {
|
if (MatrixClientPeg.get().isGuest()) {
|
||||||
if (!room.world_readable && !room.guest_can_join) {
|
if (!room.world_readable && !room.guest_can_join) {
|
||||||
var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
|
var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
|
||||||
|
@ -145,19 +157,17 @@ module.exports = React.createClass({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var room_alias = get_display_alias_for_room(room);
|
if (!room_alias) {
|
||||||
|
room_alias = get_display_alias_for_room(room);
|
||||||
|
}
|
||||||
|
|
||||||
oob_data = {
|
payload.oob_data = {
|
||||||
avatarUrl: room.avatar_url,
|
avatarUrl: room.avatar_url,
|
||||||
// XXX: This logic is duplicated from the JS SDK which
|
// XXX: This logic is duplicated from the JS SDK which
|
||||||
// would normally decide what the name is.
|
// would normally decide what the name is.
|
||||||
name: room.name || room_alias || "Unnamed room",
|
name: room.name || room_alias || "Unnamed room",
|
||||||
};
|
};
|
||||||
|
}
|
||||||
var payload = {
|
|
||||||
oob_data: oob_data,
|
|
||||||
action: 'view_room',
|
|
||||||
};
|
|
||||||
// It's not really possible to join Matrix rooms by ID because the HS has no way to know
|
// 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
|
// 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
|
// this list without aliases at present, so if roomAlias isn't set here we have no
|
||||||
|
@ -213,7 +223,7 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
rows.unshift(
|
rows.unshift(
|
||||||
<tr key={ rooms[i].room_id }
|
<tr key={ rooms[i].room_id }
|
||||||
onClick={self.showRoom.bind(null, rooms[i])}
|
onClick={self.onRoomClicked.bind(self, rooms[i])}
|
||||||
// cancel onMouseDown otherwise shift-clicking highlights text
|
// cancel onMouseDown otherwise shift-clicking highlights text
|
||||||
onMouseDown={(ev) => {ev.preventDefault();}}
|
onMouseDown={(ev) => {ev.preventDefault();}}
|
||||||
>
|
>
|
||||||
|
@ -245,7 +255,7 @@ module.exports = React.createClass({
|
||||||
this.forceUpdate();
|
this.forceUpdate();
|
||||||
this.setState({ roomAlias : this.refs.roomAlias.value })
|
this.setState({ roomAlias : this.refs.roomAlias.value })
|
||||||
if (ev.key == "Enter") {
|
if (ev.key == "Enter") {
|
||||||
this.showRoom(null, this.refs.roomAlias.value);
|
this.showRoomAlias(this.refs.roomAlias.value);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue