matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Trying to get rid of the date separator problem

Browse Source
This commit is contained in:
Luke Barnard
2016-11-09 16:24:56 +00:00
parent 2f02c4b84e
commit 04a934f738
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,8 +294,6 @@ module.exports = React.createClass({
// Wrap consecutive member events in a ListSummary // Wrap consecutive member events in a ListSummary
if (isMembershipChange(mxEv)) { if (isMembershipChange(mxEv)) {
// Prevent message continuations between truncations
prevEvent = null;
let summarisedEvents = [mxEv]; let summarisedEvents = [mxEv];
i++; i++;
@ -308,15 +306,15 @@ module.exports = React.createClass({
} }
summarisedEvents.push(collapsedMxEv); summarisedEvents.push(collapsedMxEv);
} }
let ePrev = null;
let renderEvents = (events) => { let renderEvents = (events) => {
if (events.length === 0) { if (events.length === 0) {
return null; return null;
} }
return events.map( return events.map(
(e) => { (e) => {
let ret = this._getTilesForEvent(ePrev, e); // e, e to prevent date seperators
ePrev = e; let ret = this._getTilesForEvent(e, e);
return ret; return ret;
} }
).reduce((a,b) => a.concat(b)); ).reduce((a,b) => a.concat(b));
@ -327,6 +325,8 @@ module.exports = React.createClass({
renderEvents={renderEvents} renderEvents={renderEvents}
/> />
); );
// Use the first member event to create scroll token
ret.push(<li key={eventId} data-scroll-token={eventId}/>);
continue; continue;
} }