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

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2017-10-25 13:07:34 +00:00
parent 4775fffad9 813d0cd64c
commit feff4e85d4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/MessagePanel.js
View File

@ -353,7 +353,7 @@ module.exports = React.createClass({
} }
if (!isMembershipChange(collapsedMxEv) || if (!isMembershipChange(collapsedMxEv) ||
this._wantsDateSeparator(this.props.events[i], collapsedMxEv.getDate())) { this._wantsDateSeparator(mxEv, collapsedMxEv.getDate())) {
break; break;
} }
@ -376,9 +376,7 @@ module.exports = React.createClass({
// 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, e === lastShownEvent); return this._getTilesForEvent(e, e, e === lastShownEvent);
prevEvent = e;
return ret;
}).reduce((a, b) => a.concat(b)); }).reduce((a, b) => a.concat(b));
if (eventTiles.length === 0) { if (eventTiles.length === 0) {
@ -397,6 +395,7 @@ module.exports = React.createClass({
ret.push(this._getReadMarkerTile(visible)); ret.push(this._getReadMarkerTile(visible));
} }
prevEvent = mxEv;
continue; continue;
} }