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

fix logic ordering 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2017-07-21 22:45:19 +01:00
parent 17758cd1db
commit 5808fce60e
No known key found for this signature in database
GPG Key ID: 0435A1D4BBD34D64
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,16 +351,16 @@ module.exports = React.createClass({
break; break;
} }
// Ignore redacted member events
if (!this._shouldShowEvent(collapsedMxEv)) {
continue;
}
// If RM event is in MELS mark it as such and the RM will be appended after MELS. // If RM event is in MELS mark it as such and the RM will be appended after MELS.
if (collapsedMxEv.getId() === this.props.readMarkerEventId) { if (collapsedMxEv.getId() === this.props.readMarkerEventId) {
readMarkerInMels = true; readMarkerInMels = true;
} }
// Ignore redacted member events
if (!this._shouldShowEvent(collapsedMxEv)) {
continue;
}
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