summary refs log tree commit diff
path: root/webclient/room/room-controller.js
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-11-04 10:30:34 +0000
committerKegan Dougal <kegan@matrix.org>2014-11-04 10:30:34 +0000
commit5949571fe75eecefc9ff2433d9de46dfa5b80902 (patch)
treebe2f0259bd8e245dfee66eabe6fdeba2608d088f /webclient/room/room-controller.js
parentRejig display names when paginating to lie less. (diff)
downloadsynapse-5949571fe75eecefc9ff2433d9de46dfa5b80902.tar.xz
SYWEB-116: Implement historical display name support.
This works for both live and paginated events. Each 'message' event has
an associated '__room_member' key which points to the state of the sender
at that point in time. Invites have an additional key '__target_room_member'
which point to the state of the invitee at that point in time. This obviates
the need for mapping user_ids to *current* displaynames in the message list,
though this is still required for the user/presence list.
Diffstat (limited to 'webclient/room/room-controller.js')
-rw-r--r--webclient/room/room-controller.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 0bcc33ab4f..2e0f5faff0 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -1007,7 +1007,8 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
         $scope.event_selected = angular.copy(content);
         
         // FIXME: Pre-calculated event data should be stripped in a nicer way.
-        $scope.event_selected.room_member = undefined;
+        $scope.event_selected.__room_member = undefined;
+        $scope.event_selected.__target_room_member = undefined;
         
         // scope this so the template can check power levels and enable/disable
         // buttons