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

Improved room page loading flow: do pagination only when the members list is available. 

Killed an unexpected pagination trigger when the page load: paginateMore
This commit is contained in:
Emmanuel ROHEE 2014-09-09 16:46:30 +02:00
parent 746ed57c0e
commit 1ef51e7939
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
events_from: "END", // when to start the event stream from. events_from: "END", // when to start the event stream from.
earliest_token: "END", // stores how far back we've paginated. earliest_token: "END", // stores how far back we've paginated.
first_pagination: true, // this is toggled off when the first pagination is done first_pagination: true, // this is toggled off when the first pagination is done
can_paginate: true, // this is toggled off when we run out of items can_paginate: false, // this is toggled off when we are not ready yet to paginate or when we run out of items
paginating: false, // used to avoid concurrent pagination requests pulling in dup contents paginating: false, // used to avoid concurrent pagination requests pulling in dup contents
stream_failure: undefined, // the response when the stream fails stream_failure: undefined, // the response when the stream fails
waiting_for_joined_event: false // true when the join request is pending. Back to false once the corresponding m.room.member event is received waiting_for_joined_event: false // true when the join request is pending. Back to false once the corresponding m.room.member event is received
@ -679,13 +679,15 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
// Arm list timing update timer // Arm list timing update timer
updateMemberListPresenceAge(); updateMemberListPresenceAge();
// Start pagination
$scope.state.can_paginate = true;
paginate(MESSAGES_PER_PAGINATION);
}, },
function(error) { function(error) {
$scope.feedback = "Failed get member list: " + error.data.error; $scope.feedback = "Failed get member list: " + error.data.error;
} }
); );
paginate(MESSAGES_PER_PAGINATION);
}; };
$scope.inviteUser = function(user_id) { $scope.inviteUser = function(user_id) {