matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

Tweak duplicateStrategy code to reduce diff

Browse Source
This commit is contained in:
Richard van der Hoff
2016-01-15 13:23:51 +00:00
parent 706966ffe9
commit e68ab7d54a
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/models/room.js
View File

@@ -541,11 +541,10 @@ Room.prototype.addEvents = function(events, duplicateStrategy) {
// N.B. account_data is added directly by /sync to avoid // N.B. account_data is added directly by /sync to avoid
// having to maintain an event.isAccountData() here // having to maintain an event.isAccountData() here
else { else {
if (duplicateStrategy) { var timeline = this._eventIdToTimeline[events[i].getId()];
if (timeline && duplicateStrategy) {
// is there a duplicate? // is there a duplicate?
var shouldIgnore = false; var shouldIgnore = false;
var timeline = this._eventIdToTimeline[events[i].getId()];
if (timeline) {
var tlEvents = timeline.getEvents(); var tlEvents = timeline.getEvents();
for (var j = 0; j < tlEvents.length; j++) { for (var j = 0; j < tlEvents.length; j++) {
if (tlEvents[j].getId() === events[i].getId()) { if (tlEvents[j].getId() === events[i].getId()) {
@@ -570,7 +569,6 @@ Room.prototype.addEvents = function(events, duplicateStrategy) {
} }
} }
} }
}
if (shouldIgnore) { if (shouldIgnore) {
continue; // skip the insertion of this event. continue; // skip the insertion of this event.
} }