OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

change lastShownEventIndex -> lastShownEvent since some places 

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)
pull/21833/head
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
// a local echo, to manage the read-marker.
var lastShownEventIndex = -1;
let lastShownEvent;
var lastShownNonLocalEchoIndex = -1;
for (i = this.props.events.length-1; i >= 0; i--) {
var mxEv = this.props.events[i];
@ -274,8 +275,8 @@ module.exports = React.createClass({
continue;
}
if (lastShownEventIndex < 0) {
lastShownEventIndex = i;
if (lastShownEvent === undefined) {
lastShownEvent = mxEv;
}
if (mxEv.status) {
@ -307,7 +308,7 @@ module.exports = React.createClass({
let mxEv = this.props.events[i];
let eventId = mxEv.getId();
let readMarkerInMels = false;
let last = (i === lastShownEventIndex);
let last = (mxEv === lastShownEvent);
const wantTile = this._shouldShowEvent(mxEv);
@ -350,14 +351,14 @@ module.exports = React.createClass({
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) => {
// In order to prevent DateSeparators from appearing in the expanded form
// of MemberEventListSummary, render each member event as if the previous
// one was itself. This way, the timestamp of the previous event === the
// 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;
return ret;
}).reduce((a, b) => a.concat(b));