Merge branch 'develop' into matthew/orderable-roomlist
This commit is contained in:
commit
07200d7953
3 changed files with 29 additions and 21 deletions
|
@ -236,7 +236,8 @@ var RoomTile = React.createClass({
|
|||
name = this.props.room.getMember(myUserId).events.member.getSender();
|
||||
}
|
||||
else {
|
||||
name = this.props.room.name;
|
||||
// XXX: We should never display raw room IDs, but sometimes the room name js sdk gives is undefined
|
||||
name = this.props.room.name || this.props.room.roomId;
|
||||
}
|
||||
|
||||
name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue