diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:37:31 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:37:31 +0100 |
| commit | f6daa9f1703d0f924dc2c519151b841def4a051b (patch) | |
| tree | feebb74986533487afe19e91f3e52437d3fd1fad /webclient/room/room.html | |
| parent | Add 'state_key' to valid_keys (diff) | |
| parent | URL renaming: Room state keys now use the format /rooms/$roomid/state/$event_... (diff) | |
| download | synapse-f6daa9f1703d0f924dc2c519151b841def4a051b.tar.xz | |
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'webclient/room/room.html')
| -rw-r--r-- | webclient/room/room.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index 06ca63d2ea..c167819f15 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -44,7 +44,7 @@ <span ng-hide='msg.type !== "m.room.member"'> {{ members[msg.user_id].displayname || msg.user_id }} {{ {"join": "joined", "leave": "left", "invite": "invited"}[msg.content.membership] }} - {{ msg.content.target_id || '' }} + {{ msg.content.membership === "invite" ? (msg.state_key || '') : '' }} </span> <span ng-hide='msg.content.msgtype !== "m.emote"' ng-bind-html="'* ' + (members[msg.user_id].displayname || msg.user_id) + ' ' + msg.content.body | linky:'_blank'"/> <span ng-hide='msg.content.msgtype !== "m.text"' ng-bind-html="((msg.content.msgtype === 'm.text') ? msg.content.body : '') | linky:'_blank'"/> |