diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-11-03 17:49:09 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-11-03 17:49:09 +0000 |
| commit | efb0f6e23b3dfc8e6f239f9dddc01b8bdd221e64 (patch) | |
| tree | 04ea4509c098378bbbe71918c7c6a14c32badf1e /webclient/room/room.html | |
| parent | Reference the room_member key on messages which adjusts for current vs old_ro... (diff) | |
| download | synapse-efb0f6e23b3dfc8e6f239f9dddc01b8bdd221e64.tar.xz | |
Backwards compat for old-style avatar_urls
Diffstat (limited to 'webclient/room/room.html')
| -rw-r--r-- | webclient/room/room.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index cd2a5e9c23..60b875f17b 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -134,7 +134,8 @@ </div> </td> <td class="avatar"> - <img class="avatarImage" ng-src="{{ msg.room_member.content.avatar_url || 'img/default-profile.png' }}" width="32" height="32" title="{{msg.user_id}}" + <!-- msg.room_member.avatar_url is just backwards compat, and can be removed in the future. --> + <img class="avatarImage" ng-src="{{ msg.room_member.content.avatar_url || msg.room_member.avatar_url || 'img/default-profile.png' }}" width="32" height="32" title="{{msg.user_id}}" ng-hide="room.events[$index - 1].user_id === msg.user_id || msg.user_id === state.user_id"/> </td> <td ng-class="(!msg.content.membership && ('m.room.topic' !== msg.type && 'm.room.name' !== msg.type))? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : 'membership text'"> |