diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index a0135fb0c3..55629aa8b0 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -121,7 +121,7 @@ module.exports = React.createClass({
var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
- var av = this.props.avatarJsx || ;
+ var av = this.props.avatarJsx || ;
return (
);
} else {
- // TODO: Cache this calculation
- var room = MatrixClientPeg.get().getRoom(this.props.roomId);
- /* var allUsers = MatrixClientPeg.get().getUsers();
- // only add Users if they are not joined
- allUsers = allUsers.filter(function(u) {
- return !room.hasMembershipState(u.userId, "join");
- }); */
var SearchableEntityList = sdk.getComponent("rooms.SearchableEntityList");
return (
+ entities={Entities.fromUsers(this.userList || [], true, this.onInvite)} />
);
}
},
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index 8657293478..b6232362ac 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -50,6 +50,12 @@ var SearchableEntityList = React.createClass({
};
},
+ componentWillUnmount: function() {
+ // pretend the query box was blanked out else filters could still be
+ // applied to other components which rely on onQueryChanged.
+ this.props.onQueryChanged("");
+ },
+
/**
* Public-facing method to set the input query text to the given input.
* @param {string} input