diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-15 17:47:45 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-15 17:47:45 +0100 |
| commit | 0e6a2f87f96124b707994439beb90787e2d578d1 (patch) | |
| tree | fee86f19ace702fb6aa860a07b9ad80e28ac78d5 /webclient/room/room-controller.js | |
| parent | Added infinite scrolling. It's sliiiightly buggy in that it jumps down the li... (diff) | |
| download | synapse-0e6a2f87f96124b707994439beb90787e2d578d1.tar.xz | |
Get presence for members when you enter a room (it was coming down but wasn't being stored in the right place)
Diffstat (limited to 'webclient/room/room-controller.js')
| -rw-r--r-- | webclient/room/room-controller.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 6f1aeccca4..1b921325b3 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -111,6 +111,10 @@ angular.module('RoomController', []) var updateMemberList = function(chunk) { var isNewMember = !(chunk.target_user_id in $scope.members); if (isNewMember) { + if ("state" in chunk.content) { + chunk.presenceState = chunk.content.state; + } + $scope.members[chunk.target_user_id] = chunk; // get their display name and profile picture and set it to their // member entry in $scope.members. We HAVE to use $timeout with 0 delay |