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

Inline renderEvents

pull/21833/head
Luke Barnard 2016-11-10 17:26:36 +00:00
parent d2d7ebc979
commit 3ec7940d12
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,28 +308,23 @@ module.exports = React.createClass({
// At this point, i = this.props.events.length OR i = the index of the last
// MembershipChange in a sequence of MembershipChanges
let renderEvents = (pEvent, events) => {
if (events.length === 0) {
return null;
let eventTiles = summarisedEvents.map(
(e) => {
let ret = this._getTilesForEvent(prevEvent, e);
prevEvent = e;
return ret;
}
return events.map(
(e) => {
let ret = this._getTilesForEvent(pEvent, e);
pEvent = e;
return ret;
}
).reduce((a,b) => a.concat(b));
};
).reduce((a,b) => a.concat(b));
let eventTiles = renderEvents(prevEvent, summarisedEvents);
if (eventTiles.length === 0) {
eventTiles = null;
}
ret.push(
<MemberEventListSummary events={summarisedEvents}>
{eventTiles}
</MemberEventListSummary>
);
// Set previous event to last MembershipChange
prevEvent = this.props.events[i - 1];
continue;
}