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

unrevert most of the logic. 

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

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

@ -306,14 +306,11 @@ module.exports = React.createClass({
for (i = 0; i < this.props.events.length; i++) { for (i = 0; i < this.props.events.length; i++) {
let mxEv = this.props.events[i]; let mxEv = this.props.events[i];
let wantTile = true;
let eventId = mxEv.getId(); let eventId = mxEv.getId();
let readMarkerInMels = false; let readMarkerInMels = false;
let last = (i === lastShownEventIndex); let last = (i === lastShownEventIndex);
if (!this._shouldShowEvent(mxEv)) { const wantTile = this._shouldShowEvent(mxEv);
wantTile = false;
}
// Wrap consecutive member events in a ListSummary, ignore if redacted // Wrap consecutive member events in a ListSummary, ignore if redacted
if (isMembershipChange(mxEv) && wantTile) { if (isMembershipChange(mxEv) && wantTile) {
@ -392,7 +389,7 @@ module.exports = React.createClass({
continue; continue;
} }
if (EventTile.haveTileForEvent(mxEv)) { if (wantTile) {
// make sure we unpack the array returned by _getTilesForEvent, // make sure we unpack the array returned by _getTilesForEvent,
// otherwise react will auto-generate keys and we will end up // otherwise react will auto-generate keys and we will end up
// replacing all of the DOM elements every time we paginate. // replacing all of the DOM elements every time we paginate.

8
src/components/structures/TimelinePanel.js
View File

@ -181,12 +181,6 @@ var TimelinePanel = React.createClass({
// always show timestamps on event tiles? // always show timestamps on event tiles?
alwaysShowTimestamps: syncedSettings.alwaysShowTimestamps, alwaysShowTimestamps: syncedSettings.alwaysShowTimestamps,
// hide redacted events as per old behaviour
hideRedactions: syncedSettings.hideRedactions,
// hide membership joins and leaves
hideJoinLeaves: syncedSettings.hideJoinLeaves,
}; };
}, },
@ -1125,8 +1119,6 @@ var TimelinePanel = React.createClass({
return ( return (
<MessagePanel ref="messagePanel" <MessagePanel ref="messagePanel"
hidden={ this.props.hidden } hidden={ this.props.hidden }
hideJoinLeaves={ this.state.hideJoinLeaves }
hideRedactions={ this.state.hideRedactions }
backPaginating={ this.state.backPaginating } backPaginating={ this.state.backPaginating }
forwardPaginating={ forwardPaginating } forwardPaginating={ forwardPaginating }
events={ this.state.events } events={ this.state.events }