summary refs log tree commit diff
path: root/syweb/webclient/room
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-11-14 11:59:33 +0000
committerKegan Dougal <kegan@matrix.org>2014-11-14 12:59:22 +0000
commitd5a42e9d9ce773821b04e46cf5bf1f9117cd4718 (patch)
treedd39bbcfdae41957c13197c3dab12fe667739125 /syweb/webclient/room
parentMerge pull request #13 from matrix-org/request_logging (diff)
downloadsynapse-d5a42e9d9ce773821b04e46cf5bf1f9117cd4718.tar.xz
Use modelService for getting current presence state rather than RoomController.members
Diffstat (limited to 'syweb/webclient/room')
-rw-r--r--syweb/webclient/room/room.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/syweb/webclient/room/room.html b/syweb/webclient/room/room.html
index ee7c9777a9..d282a5dbe3 100644
--- a/syweb/webclient/room/room.html
+++ b/syweb/webclient/room/room.html
@@ -127,7 +127,7 @@
     
     <div id="usersTableWrapper" ng-hide="state.permission_denied">
         <div ng-repeat="member in members | orderMembersList" class="userAvatar">
-            <div class="userAvatarFrame" ng-class="(member.presence === 'online' ? 'online' : (member.presence === 'unavailable' ? 'unavailable' : '')) + ' ' + (member.membership == 'invite' ? 'invited' : '')">
+            <div class="userAvatarFrame" ng-class="(room.now.members[member.id].user.event.content.presence === 'online' ? 'online' : (room.now.members[member.id].user.event.content.presence === 'unavailable' ? 'unavailable' : '')) + ' ' + (member.membership == 'invite' ? 'invited' : '')">
                 <img class="userAvatarImage mouse-pointer" 
                      ng-click="$parent.goToUserPage(member.id)"
                      ng-src="{{member.avatar_url || 'img/default-profile.png'}}"