matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-06 12:02:40 +03:00
Code Activity

EventTimeline: Fix baseIndex after removing the last event

Browse Source 
Removing the last event in an EventTimeline (as we might, for instance, if it
was a local echo in an empty timeline) got us into a state where the baseIndex
would increment when adding events to the end of the timeline, causing much
confusion.
This commit is contained in:
Richard van der Hoff
2016-02-16 22:22:26 +00:00
parent 977e33f1bd
commit 88827fab84
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ var MatrixEvent = require("./event").MatrixEvent;
function EventTimeline(roomId) { function EventTimeline(roomId) {
this._roomId = roomId; this._roomId = roomId;
this._events = []; this._events = [];
this._baseIndex = -1; this._baseIndex = 0;
this._startState = new RoomState(roomId); this._startState = new RoomState(roomId);
this._startState.paginationToken = null; this._startState.paginationToken = null;
this._endState = new RoomState(roomId); this._endState = new RoomState(roomId);
@@ -252,7 +252,7 @@ EventTimeline.prototype.addEvent = function(event, atStart, spliceBeforeLocalEch
} }
this._events.splice(insertIndex, 0, event); // insert element this._events.splice(insertIndex, 0, event); // insert element
if (insertIndex <= this._baseIndex || this._baseIndex == -1) { if (atStart) {
this._baseIndex++; this._baseIndex++;
} }
}; };

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

@@ -143,9 +143,9 @@ describe("EventTimeline", function() {
it("should be able to add events to the end", function() { it("should be able to add events to the end", function() {
timeline.addEvent(events[0], false); timeline.addEvent(events[0], false);
expect(timeline.getBaseIndex()).toEqual(0); var initialIndex = timeline.getBaseIndex();
timeline.addEvent(events[1], false); timeline.addEvent(events[1], false);
expect(timeline.getBaseIndex()).toEqual(0); expect(timeline.getBaseIndex()).toEqual(initialIndex);
expect(timeline.getEvents().length).toEqual(2); expect(timeline.getEvents().length).toEqual(2);
expect(timeline.getEvents()[0]).toEqual(events[0]); expect(timeline.getEvents()[0]).toEqual(events[0]);
expect(timeline.getEvents()[1]).toEqual(events[1]); expect(timeline.getEvents()[1]).toEqual(events[1]);
@@ -153,9 +153,9 @@ describe("EventTimeline", function() {
it("should be able to add events to the start", function() { it("should be able to add events to the start", function() {
timeline.addEvent(events[0], true); timeline.addEvent(events[0], true);
expect(timeline.getBaseIndex()).toEqual(0); var initialIndex = timeline.getBaseIndex();
timeline.addEvent(events[1], true); timeline.addEvent(events[1], true);
expect(timeline.getBaseIndex()).toEqual(1); expect(timeline.getBaseIndex()).toEqual(initialIndex+1);
expect(timeline.getEvents().length).toEqual(2); expect(timeline.getEvents().length).toEqual(2);
expect(timeline.getEvents()[0]).toEqual(events[1]); expect(timeline.getEvents()[0]).toEqual(events[1]);
expect(timeline.getEvents()[1]).toEqual(events[0]); expect(timeline.getEvents()[1]).toEqual(events[0]);
@@ -346,6 +346,20 @@ describe("EventTimeline", function() {
expect(timeline.getEvents().length).toEqual(1); expect(timeline.getEvents().length).toEqual(1);
expect(timeline.getBaseIndex()).toEqual(0); expect(timeline.getBaseIndex()).toEqual(0);
}); });
// this is basically https://github.com/vector-im/vector-web/issues/937
// - removing the last event got baseIndex into such a state that
// further addEvent(ev, false) calls made the index increase.
it("should not make baseIndex assplode when removing the last event",
function() {
timeline.addEvent(events[0], true);
timeline.removeEvent(events[0].getId());
var initialIndex = timeline.getBaseIndex();
timeline.addEvent(events[1], false);
timeline.addEvent(events[2], false);
expect(timeline.getBaseIndex()).toEqual(initialIndex);
expect(timeline.getEvents().length).toEqual(2);
});
}); });
}); });