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

pr feedback

pull/21833/head
Bruno Windels 2019-09-11 16:18:34 +02:00
parent 094c9e3468
commit 77175fcbc4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,7 +470,10 @@ module.exports = createReactClass({
topic = `${topic.substring(0, MAX_TOPIC_LENGTH)}...`; topic = `${topic.substring(0, MAX_TOPIC_LENGTH)}...`;
} }
topic = linkifyAndSanitizeHtml(topic); topic = linkifyAndSanitizeHtml(topic);
const avatarUrl = ContentRepo.getHttpUriForMxc(
MatrixClientPeg.get().getHomeserverUrl(),
room.avatar_url, 24, 24, "crop",
);
return ( return (
<tr key={ room.room_id } <tr key={ room.room_id }
onClick={() => this.onRoomClicked(room)} onClick={() => this.onRoomClicked(room)}
@ -480,15 +483,13 @@ module.exports = createReactClass({
<td className="mx_RoomDirectory_roomAvatar"> <td className="mx_RoomDirectory_roomAvatar">
<BaseAvatar width={24} height={24} resizeMethod='crop' <BaseAvatar width={24} height={24} resizeMethod='crop'
name={ name } idName={ name } name={ name } idName={ name }
url={ ContentRepo.getHttpUriForMxc( url={ avatarUrl } />
MatrixClientPeg.get().getHomeserverUrl(),
room.avatar_url, 24, 24, "crop") } />
</td> </td>
<td className="mx_RoomDirectory_roomDescription"> <td className="mx_RoomDirectory_roomDescription">
<div className="mx_RoomDirectory_name">{ name }</div>&nbsp; <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
<div className="mx_RoomDirectory_topic" <div className="mx_RoomDirectory_topic"
onClick={ (ev) => { ev.stopPropagation(); } } onClick={ (ev) => { ev.stopPropagation(); } }
dangerouslySetInnerHTML={{ __html: topic }} /> dangerouslySetInnerHTML={{ __html: topic }} />
<div className="mx_RoomDirectory_alias">{ get_display_alias_for_room(room) }</div> <div className="mx_RoomDirectory_alias">{ get_display_alias_for_room(room) }</div>
</td> </td>
<td className="mx_RoomDirectory_roomMemberCount"> <td className="mx_RoomDirectory_roomMemberCount">