Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

roll back b602834 as it made a bizarre subset of avatars go awol

This commit is contained in:
Matthew Hodgson 2014-08-16 13:28:04 +01:00
parent ce4ca473cb
commit dc6212b6fb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webclient/room/room-controller.js
View File

@ -124,18 +124,18 @@ angular.module('RoomController', [])
if ("mtime_age" in chunk.content) { if ("mtime_age" in chunk.content) {
chunk.mtime_age = chunk.content.mtime_age; chunk.mtime_age = chunk.content.mtime_age;
} }
/*
// FIXME: once the HS reliably returns the displaynames & avatar_urls for both
// local and remote users, we should use this rather than the evalAsync block
// below
if ("displayname" in chunk.content) { if ("displayname" in chunk.content) {
chunk.displayname = chunk.content.displayname; chunk.displayname = chunk.content.displayname;
} }
if ("avatar_url" in chunk.content) { if ("avatar_url" in chunk.content) {
chunk.avatar_url = chunk.content.avatar_url; chunk.avatar_url = chunk.content.avatar_url;
} }
*/
$scope.members[chunk.target_user_id] = chunk; $scope.members[chunk.target_user_id] = chunk;
/*
// *SURELY* we don't want to be hammering a new request for
// every displayname and profile picture URL. Hasn't it already
// been returned in the chunk? Hence commenting this out --Matthew
// get their display name and profile picture and set it to their // 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 // member entry in $scope.members. We HAVE to use $timeout with 0 delay
@ -160,7 +160,6 @@ angular.module('RoomController', [])
} }
); );
}); });
*/
} }
else { else {
// selectively update membership else it will nuke the picture and displayname too :/ // selectively update membership else it will nuke the picture and displayname too :/