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

Merge pull request #344 from matrix-org/dbkr/remove_initial_memberlist_load_hack 

Remove the member list loading hack
pull/21833/head
Richard van der Hoff 2016-07-14 18:50:52 +01:00 committed by GitHub
parent 2e776f540e 3abdb83d16
commit 8144b894f7
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/views/rooms/MemberList.js
View File

@ -54,7 +54,7 @@ module.exports = React.createClass({
this.memberDict = this.getMemberDict(); this.memberDict = this.getMemberDict();
state.members = this.roomMembers(INITIAL_LOAD_NUM_MEMBERS); state.members = this.roomMembers();
return state; return state;
}, },
@ -83,19 +83,6 @@ module.exports = React.createClass({
} }
}, },
componentDidMount: function() {
var self = this;
// Lazy-load in more than the first N members
setTimeout(function() {
if (!self.isMounted()) return;
// lazy load to prevent it blocking the first render
self.setState({
members: self.roomMembers()
});
}, 50);
},
/* /*
onRoomTimeline: function(ev, room, toStartOfTimeline, removed, data) { onRoomTimeline: function(ev, room, toStartOfTimeline, removed, data) {
// ignore anything but real-time updates at the end of the room: // ignore anything but real-time updates at the end of the room:
@ -328,7 +315,7 @@ module.exports = React.createClass({
return all_members; return all_members;
}, },
roomMembers: function(limit) { roomMembers: function() {
var all_members = this.memberDict || {}; var all_members = this.memberDict || {};
var all_user_ids = Object.keys(all_members); var all_user_ids = Object.keys(all_members);
var ConferenceHandler = CallHandler.getConferenceHandler(); var ConferenceHandler = CallHandler.getConferenceHandler();
@ -337,7 +324,7 @@ module.exports = React.createClass({
var to_display = []; var to_display = [];
var count = 0; var count = 0;
for (var i = 0; i < all_user_ids.length && (limit === undefined || count < limit); ++i) { for (var i = 0; i < all_user_ids.length; ++i) {
var user_id = all_user_ids[i]; var user_id = all_user_ids[i];
var m = all_members[user_id]; var m = all_members[user_id];