OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2017-10-24 10:18:07 +00:00
parent 870babb71e ba46faf1b1
commit e9eb4a4647
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/views/groups/GroupMemberList.js
View File

@ -59,6 +59,7 @@ export default withMatrixClient(React.createClass({
}, },
_fetchMembers: function() { _fetchMembers: function() {
if (this._unmounted) return;
this.setState({ this.setState({
members: this._groupStore.getGroupMembers(), members: this._groupStore.getGroupMembers(),
invitedMembers: this._groupStore.getGroupInvitedMembers(), invitedMembers: this._groupStore.getGroupInvitedMembers(),
@ -105,12 +106,11 @@ export default withMatrixClient(React.createClass({
}); });
} }
memberList = memberList.map((m) => { const uniqueMembers = {};
return ( memberList.forEach((m) => {
<GroupMemberTile key={m.userId} groupId={this.props.groupId} member={m} /> if (!uniqueMembers[m.userId]) uniqueMembers[m.userId] = m;
);
}); });
memberList = Object.keys(uniqueMembers).map((userId) => uniqueMembers[userId]);
memberList.sort((a, b) => { memberList.sort((a, b) => {
// TODO: should put admins at the top: we don't yet have that info // TODO: should put admins at the top: we don't yet have that info
if (a < b) { if (a < b) {
@ -122,10 +122,16 @@ export default withMatrixClient(React.createClass({
} }
}); });
const memberTiles = memberList.map((m) => {
return (
<GroupMemberTile key={m.userId} groupId={this.props.groupId} member={m} />
);
});
return <TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAt} return <TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAt}
createOverflowElement={this._createOverflowTile} createOverflowElement={this._createOverflowTile}
> >
{ memberList } { memberTiles }
</TruncatedList>; </TruncatedList>;
}, },