From c3278a8262b702ac3fe72237ca188ca73e3edd8a Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 14 Nov 2014 15:39:47 +0000
Subject: [PATCH] Tidy up room.html member list to use member again, now that
 scope.members is gone.

---
 syweb/webclient/room/room.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/syweb/webclient/room/room.html b/syweb/webclient/room/room.html
index 6151a4fea7..955f5ff114 100644
--- a/syweb/webclient/room/room.html
+++ b/syweb/webclient/room/room.html
@@ -127,19 +127,19 @@
     
     <div id="usersTableWrapper" ng-hide="state.permission_denied">
         <div ng-repeat="member in room.now.members | orderMembersList" class="userAvatar">
-            <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' : '')">
+            <div class="userAvatarFrame" ng-class="(member.user.event.content.presence === 'online' ? 'online' : (member.user.event.content.presence === 'unavailable' ? 'unavailable' : '')) + ' ' + (member.event.content.membership == 'invite' ? 'invited' : '')">
                 <img class="userAvatarImage mouse-pointer" 
                      ng-click="$parent.goToUserPage(member.id)"
-                     ng-src="{{room.now.members[member.id].user.event.content.avatar_url || 'img/default-profile.png'}}" 
-                     alt="{{ room.now.members[member.id].user.event.content.displayname || member.id.substr(0, member.id.indexOf(':')) }}"
-                     title="{{ member.id }} - power: {{ room.now.members[member.id].power_level }}"
+                     ng-src="{{member.user.event.content.avatar_url || 'img/default-profile.png'}}" 
+                     alt="{{ member.user.event.content.displayname || member.id.substr(0, member.id.indexOf(':')) }}"
+                     title="{{ member.id }} - power: {{ member.power_level }}"
                      width="80" height="80"/>
                 <!-- <div class="userPowerLevel" ng-style="{'width': member.powerLevelNorm +'%'}"></div> -->
             </div>
             <div class="userName">
-                <pie-chart ng-show="room.now.members[member.id].power_level_norm" data="[ (room.now.members[member.id].power_level_norm + 0), (100 - room.now.members[member.id].power_level_norm) ]"></pie-chart>
+                <pie-chart ng-show="member.power_level_norm" data="[ (member.power_level_norm + 0), (100 - member.power_level_norm) ]"></pie-chart>
                 {{ member.id | mUserDisplayName:room_id:true }}
-                <span ng-show="room.now.members[member.id].user.event.content.last_active_ago" style="color: #aaa">({{ room.now.members[member.id].user.event.content.last_active_ago + (now - room.now.members[member.id].user.last_updated) | duration }})</span>
+                <span ng-show="member.user.event.content.last_active_ago" style="color: #aaa">({{ member.user.event.content.last_active_ago + (now - member.user.last_updated) | duration }})</span>
             </div>
         </div>
     </div>