summary refs log tree commit diff
path: root/syweb/webclient/room/room-controller.js
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-11-13 16:43:53 +0000
committerKegan Dougal <kegan@matrix.org>2014-11-13 16:43:53 +0000
commit3916e23bbd3c081b42976200387d58f90ae412d4 (patch)
tree386d1e93baa57e74afeae37e294f03a24a638757 /syweb/webclient/room/room-controller.js
parentSYWEB-152: Move up/down history fully to a directive. (diff)
downloadsynapse-3916e23bbd3c081b42976200387d58f90ae412d4.tar.xz
Remove rootScope.presence and replaced with modelService.getUser/setUser.
Diffstat (limited to 'syweb/webclient/room/room-controller.js')
-rw-r--r--syweb/webclient/room/room-controller.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/syweb/webclient/room/room-controller.js b/syweb/webclient/room/room-controller.js

index 9c1f67750e..67372a804f 100644 --- a/syweb/webclient/room/room-controller.js +++ b/syweb/webclient/room/room-controller.js
@@ -310,8 +310,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput', 'a } $scope.members[target_user_id] = chunk; - if (target_user_id in $rootScope.presence) { - updatePresence($rootScope.presence[target_user_id]); + var usr = modelService.getUser(target_user_id); + if (usr) { + updatePresence(usr.event); } } else {