summary refs log tree commit diff
path: root/syweb/webclient/recents/recents.html
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-17 10:21:51 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-17 10:21:51 +0000
commit1d3ef8734cea9a1ce8befdf27db297ca70cfeee3 (patch)
tree12c7ac945749c68b81e3ae55c39dfd58ae824bf0 /syweb/webclient/recents/recents.html
parentMerge PDUs and Events into one object (diff)
parentMove getLastMessage to modelService. (diff)
downloadsynapse-1d3ef8734cea9a1ce8befdf27db297ca70cfeee3.tar.xz
Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects
Diffstat (limited to 'syweb/webclient/recents/recents.html')
-rw-r--r--syweb/webclient/recents/recents.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/syweb/webclient/recents/recents.html b/syweb/webclient/recents/recents.html

index 0b3a77ca11..2596b094f7 100644 --- a/syweb/webclient/recents/recents.html +++ b/syweb/webclient/recents/recents.html
@@ -16,7 +16,7 @@ <td class="recentsRoomSummaryTS"> <!-- Use a temp var as alias to the last room message. Declaring it in this way ensures the data-binding --> - {{ lastMsg = eventHandlerService.getLastMessage(room.room_id, true);"" }} + {{ lastMsg = modelService.getLastMessage(room.room_id, true);"" }} {{ (lastMsg.origin_server_ts) | date:'MMM d HH:mm' }} @@ -84,7 +84,7 @@ </div> <div ng-switch-default> - {{ lastMsg.content }} + {{ lastMsg.content.body | linky:'_blank' }} </div> </div> </div>