mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 18:25:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix RoomAvatarEvent historic fallback

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2019-08-09 11:31:04 +01:00
parent 423a74c99c
commit ee3542453e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/views/avatars/BaseAvatar.js
View file

@ -133,7 +133,6 @@ module.exports = React.createClass({
}, },
onError: function(ev) { onError: function(ev) {
console.log("onError");
const nextIndex = this.state.urlsIndex + 1; const nextIndex = this.state.urlsIndex + 1;
if (nextIndex < this.state.imageUrls.length) { if (nextIndex < this.state.imageUrls.length) {
// try the next one // try the next one

4
src/components/views/messages/RoomAvatarEvent.js
View file

@ -64,8 +64,10 @@ module.exports = React.createClass({
} }
const room = MatrixClientPeg.get().getRoom(ev.getRoomId()); const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
// Provide all arguments to RoomAvatar via oobData because the avatar is historic
const oobData = { const oobData = {
avatarUrl: ev.getContent().url, avatarUrl: ev.getContent().url,
name: room ? room.name : "",
}; };
return ( return (
@ -76,7 +78,7 @@ module.exports = React.createClass({
'img': () => 'img': () =>
<AccessibleButton key="avatar" className="mx_RoomAvatarEvent_avatar" <AccessibleButton key="avatar" className="mx_RoomAvatarEvent_avatar"
onClick={this.onAvatarClick}> onClick={this.onAvatarClick}>
<RoomAvatar width={14} height={14} room={room} oobData={oobData} /> <RoomAvatar width={14} height={14} oobData={oobData} />
</AccessibleButton>, </AccessibleButton>,
}) })
} }