matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Add helpfully named variable for old timeline

Browse Source
This commit is contained in:
David Baker
2017-07-20 14:17:14 +01:00
parent ff685e33d5
commit 34adaae5af
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/models/event-timeline-set.js
View File

@@ -177,8 +177,10 @@ EventTimelineSet.prototype.resetLiveTimeline = function(
newTimeline = this.addTimeline(); newTimeline = this.addTimeline();
} }
const oldTimeline = this._liveTimeline;
// Collect the state events from the old timeline // Collect the state events from the old timeline
const evMap = this._liveTimeline.getState(EventTimeline.FORWARDS).events; const evMap = oldTimeline.getState(EventTimeline.FORWARDS).events;
const events = []; const events = [];
for (const evtype in evMap) { for (const evtype in evMap) {
if (!evMap.hasOwnProperty(evtype)) { if (!evMap.hasOwnProperty(evtype)) {
@@ -200,18 +202,18 @@ EventTimelineSet.prototype.resetLiveTimeline = function(
// previous live timeline. It will be identical except that we'll keep // previous live timeline. It will be identical except that we'll keep
// using the same RoomMember objects for the 'live' set of members with any // using the same RoomMember objects for the 'live' set of members with any
// listeners still attached // listeners still attached
newTimeline._endState = this._liveTimeline._endState; newTimeline._endState = oldTimeline._endState;
// If we're not resetting all timelines, we need to fix up the old live timeline // If we're not resetting all timelines, we need to fix up the old live timeline
if (!resetAllTimelines) { if (!resetAllTimelines) {
// Firstly, we just stole the old timeline's end state, so it needs a new one. // Firstly, we just stole the old timeline's end state, so it needs a new one.
// Just swap them around and give it the one we just generated for the // Just swap them around and give it the one we just generated for the
// new live timeline. // new live timeline.
this._liveTimeline._endState = freshEndState; oldTimeline._endState = freshEndState;
// Now set the forward pagination token on the old live timeline // Now set the forward pagination token on the old live timeline
// so it can be forward-paginated. // so it can be forward-paginated.
this._liveTimeline.setPaginationToken( oldTimeline.setPaginationToken(
forwardPaginationToken, EventTimeline.FORWARDS, forwardPaginationToken, EventTimeline.FORWARDS,
); );
} }