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

change lastShownEventIndex -> lastShownEvent since some places

Browse source 
do not have the same i reference (namely MELS generation)
this way a member event at bottom of MELS (if is the last event
in the timeline will have last set appropriately)
This commit is contained in:
Michael Telatynski 2017-07-26 12:17:05 +01:00
parent 762e6780d7
commit 3eb87e2aa3
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/structures/MessagePanel.js
View file

@ -266,7 +266,8 @@ module.exports = React.createClass({
// //
// we also need to figure out which is the last event we show which isn't // we also need to figure out which is the last event we show which isn't
// a local echo, to manage the read-marker. // a local echo, to manage the read-marker.
var lastShownEventIndex = -1; let lastShownEvent;
var lastShownNonLocalEchoIndex = -1; var lastShownNonLocalEchoIndex = -1;
for (i = this.props.events.length-1; i >= 0; i--) { for (i = this.props.events.length-1; i >= 0; i--) {
var mxEv = this.props.events[i]; var mxEv = this.props.events[i];
@ -274,8 +275,8 @@ module.exports = React.createClass({
continue; continue;
} }
if (lastShownEventIndex < 0) { if (lastShownEvent === undefined) {
lastShownEventIndex = i; lastShownEvent = mxEv;
} }
if (mxEv.status) { if (mxEv.status) {
@ -307,7 +308,7 @@ module.exports = React.createClass({
let mxEv = this.props.events[i]; let mxEv = this.props.events[i];
let eventId = mxEv.getId(); let eventId = mxEv.getId();
let readMarkerInMels = false; let readMarkerInMels = false;
let last = (i === lastShownEventIndex); let last = (mxEv === lastShownEvent);
const wantTile = this._shouldShowEvent(mxEv); const wantTile = this._shouldShowEvent(mxEv);
@ -350,14 +351,14 @@ module.exports = React.createClass({
summarisedEvents.push(collapsedMxEv); summarisedEvents.push(collapsedMxEv);
} }
// At this point, i = the index of the last event in the summary sequence
// At this point, i = the index of the last event in the summary sequence
let eventTiles = summarisedEvents.map((e) => { let eventTiles = summarisedEvents.map((e) => {
// In order to prevent DateSeparators from appearing in the expanded form // In order to prevent DateSeparators from appearing in the expanded form
// of MemberEventListSummary, render each member event as if the previous // of MemberEventListSummary, render each member event as if the previous
// one was itself. This way, the timestamp of the previous event === the // one was itself. This way, the timestamp of the previous event === the
// timestamp of the current event, and no DateSeperator is inserted. // timestamp of the current event, and no DateSeperator is inserted.
const ret = this._getTilesForEvent(e, e, last); const ret = this._getTilesForEvent(e, e, e === lastShownEvent);
prevEvent = e; prevEvent = e;
return ret; return ret;
}).reduce((a, b) => a.concat(b)); }).reduce((a, b) => a.concat(b));