imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'kegan/invite-search' into matthew/roompreview

Browse source
This commit is contained in:
Kegan Dougal 2016-01-19 17:10:54 +00:00
commit bdfd09d893
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/rooms/MemberList.js
View file

@ -330,19 +330,18 @@ module.exports = React.createClass({
// TODO: Cache this calculation // TODO: Cache this calculation
var room = MatrixClientPeg.get().getRoom(this.props.roomId); var room = MatrixClientPeg.get().getRoom(this.props.roomId);
if (!room) return <div></div>; if (!room) return <div></div>;
/* var allUsers = MatrixClientPeg.get().getUsers();
var allUsers = MatrixClientPeg.get().getUsers();
// only add Users if they are not joined // only add Users if they are not joined
allUsers = allUsers.filter(function(u) { allUsers = allUsers.filter(function(u) {
return !room.hasMembershipState(u.userId, "join"); return !room.hasMembershipState(u.userId, "join");
}); }); */
var SearchableEntityList = sdk.getComponent("rooms.SearchableEntityList"); var SearchableEntityList = sdk.getComponent("rooms.SearchableEntityList");
return ( return (
<SearchableEntityList searchPlaceholderText={"Invite / Search"} <SearchableEntityList searchPlaceholderText={"Invite / Search"}
onSubmit={this.onInvite} onSubmit={this.onInvite}
onQueryChanged={this.onSearchQueryChanged} onQueryChanged={this.onSearchQueryChanged}
entities={Entities.fromUsers(allUsers, true, this.onInvite)} /> entities={[] /* Entities.fromUsers(allUsers, true, this.onInvite) */} />
); );
} }
}, },