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

make EventTimeline take an EventTimelineSet

Browse Source
This commit is contained in:
Matthew Hodgson
2016-09-07 21:17:06 +01:00
parent 9b507f6c6c
commit 91f8df8d19
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/models/event-timeline-set.js
View File

@@ -58,7 +58,7 @@ function EventTimelineSet(roomId, room, opts) {
this.room = room; this.room = room;
this._timelineSupport = Boolean(opts.timelineSupport); this._timelineSupport = Boolean(opts.timelineSupport);
this._liveTimeline = new EventTimeline(this.roomId); this._liveTimeline = new EventTimeline(this);
// just a list - *not* ordered. // just a list - *not* ordered.
this._timelines = [this._liveTimeline]; this._timelines = [this._liveTimeline];
@@ -136,7 +136,7 @@ EventTimelineSet.prototype.resetLiveTimeline = function(backPaginationToken) {
if (!this._timelineSupport) { if (!this._timelineSupport) {
// if timeline support is disabled, forget about the old timelines // if timeline support is disabled, forget about the old timelines
newTimeline = new EventTimeline(this.roomId); newTimeline = new EventTimeline(this);
this._timelines = [newTimeline]; this._timelines = [newTimeline];
this._eventIdToTimeline = {}; this._eventIdToTimeline = {};
} else { } else {
@@ -202,7 +202,7 @@ EventTimelineSet.prototype.addTimeline = function() {
" it."); " it.");
} }
var timeline = new EventTimeline(this.roomId); var timeline = new EventTimeline(this);
this._timelines.push(timeline); this._timelines.push(timeline);
return timeline; return timeline;
}; };

21
lib/models/event-timeline.js
View File

@@ -25,16 +25,17 @@ var MatrixEvent = require("./event").MatrixEvent;
* <p>Once a timeline joins up with its neighbour, they are linked together into a * <p>Once a timeline joins up with its neighbour, they are linked together into a
* doubly-linked list. * doubly-linked list.
* *
* @param {string} roomId the ID of the room where this timeline came from * @param {EventTimelineSet} eventTimelineSet the set of timelines this is part of
* @constructor * @constructor
*/ */
function EventTimeline(roomId) { function EventTimeline(eventTimelineSet) {
this._roomId = roomId; this._eventTimelineSet = eventTimelineSet;
this._roomId = eventTimelineSet.roomId;
this._events = []; this._events = [];
this._baseIndex = 0; this._baseIndex = 0;
this._startState = new RoomState(roomId); this._startState = new RoomState(this._roomId);
this._startState.paginationToken = null; this._startState.paginationToken = null;
this._endState = new RoomState(roomId); this._endState = new RoomState(this._roomId);
this._endState.paginationToken = null; this._endState.paginationToken = null;
this._prevTimeline = null; this._prevTimeline = null;
@@ -43,7 +44,7 @@ function EventTimeline(roomId) {
// this is used by client.js // this is used by client.js
this._paginationRequests = {'b': null, 'f': null}; this._paginationRequests = {'b': null, 'f': null};
this._name = roomId + ":" + new Date().toISOString(); this._name = this._roomId + ":" + new Date().toISOString();
} }
/** /**
@@ -91,6 +92,14 @@ EventTimeline.prototype.getRoomId = function() {
return this._roomId; return this._roomId;
}; };
/**
* Get the filter for this timeline's timelineSet (if any)
* @return {Filter}} filter
*/
EventTimeline.prototype.getFilter = function() {
return this._eventTimelineSet.getFilter();
};
/** /**
* Get the base index. * Get the base index.
* *

2
spec/unit/event-timeline.spec.js
View File

@@ -16,7 +16,7 @@ describe("EventTimeline", function() {
beforeEach(function() { beforeEach(function() {
utils.beforeEach(this); utils.beforeEach(this);
timeline = new EventTimeline(roomId); timeline = new EventTimeline({ roomId : roomId });
}); });
describe("construction", function() { describe("construction", function() {

2
spec/unit/timeline-window.spec.js
View File

@@ -18,7 +18,7 @@ function createTimeline(numEvents, baseIndex) {
if (numEvents === undefined) { numEvents = 3; } if (numEvents === undefined) { numEvents = 3; }
if (baseIndex === undefined) { baseIndex = 1; } if (baseIndex === undefined) { baseIndex = 1; }
var timeline = new EventTimeline(ROOM_ID); var timeline = new EventTimeline({ roomId : ROOM_ID });
// add the events after the baseIndex first // add the events after the baseIndex first
addEventsToTimeline(timeline, numEvents - baseIndex, false); addEventsToTimeline(timeline, numEvents - baseIndex, false);