PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #182 from matrix-org/rav/pagination_race

Browse source 
Fix a race condition handling gappy syncs
This commit is contained in:
Richard van der Hoff 2016-03-01 11:50:09 +00:00
commit 3718377355
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/components/structures/TimelinePanel.js
View file

@ -229,6 +229,8 @@ var TimelinePanel = React.createClass({
if (!this.refs.messagePanel) return; if (!this.refs.messagePanel) return;
if (!this.refs.messagePanel.getScrollState().stuckAtBottom) return;
// when a new event arrives when the user is not watching the window, but the // when a new event arrives when the user is not watching the window, but the
// window is in its auto-scroll mode, make sure the read marker is visible. // window is in its auto-scroll mode, make sure the read marker is visible.
// //
@ -242,19 +244,21 @@ var TimelinePanel = React.createClass({
var myUserId = MatrixClientPeg.get().credentials.userId; var myUserId = MatrixClientPeg.get().credentials.userId;
var sender = ev.sender ? ev.sender.userId : null; var sender = ev.sender ? ev.sender.userId : null;
var activity_age = Date.now() - this.user_last_active; var activity_age = Date.now() - this.user_last_active;
if (sender != myUserId && this.refs.messagePanel.getScrollState().stuckAtBottom if (sender != myUserId && activity_age > CONSIDER_USER_ACTIVE_FOR_MS) {
&& activity_age > CONSIDER_USER_ACTIVE_FOR_MS) {
this.setState({readMarkerVisible: true}); this.setState({readMarkerVisible: true});
} }
// tell the messagepanel to go paginate itself. This in turn will cause // tell the timeline window to try to advance itself, but not to make
// onMessageListFillRequest to be called, which will call // an http request to do so.
// _onTimelineUpdated, which will update the state with the new event -
// so there is no need update the state here.
// //
if (this.refs.messagePanel) { // we deliberately avoid going via the ScrollPanel for this call - the
this.refs.messagePanel.checkFillState(); // ScrollPanel might already have an active pagination promise, which
} // will fail, but would stop us passing the pagination request to the
// timeline window.
//
// see https://github.com/vector-im/vector-web/issues/1035
this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false)
.done(this._onTimelineUpdated);
}, },
onRoomTimelineReset: function(room) { onRoomTimelineReset: function(room) {