PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

local echos should always be ignored (for both RM and RR),so remove flag

Browse source 
pending events won't be in liveEvents (where we look) anyway
This commit is contained in:
Bruno Windels 2019-07-17 10:19:44 +02:00
parent c94715150d
commit 3d4cd8aa1c
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/structures/TimelinePanel.js
View file

@ -738,14 +738,8 @@ const TimelinePanel = React.createClass({
// move the RM to *after* the message at the bottom of the screen. This // move the RM to *after* the message at the bottom of the screen. This
// avoids a problem whereby we never advance the RM if there is a huge // avoids a problem whereby we never advance the RM if there is a huge
// message which doesn't fit on the screen. // message which doesn't fit on the screen.
//
// But ignore local echoes for this - they have a temporary event ID
// and we'll get confused when their ID changes and we can't figure out
// where the RM is pointing to. The read marker will be invisible for
// now anyway, so this doesn't really matter.
const lastDisplayedIndex = this._getLastDisplayedEventIndex({ const lastDisplayedIndex = this._getLastDisplayedEventIndex({
allowPartial: true, allowPartial: true,
ignoreEchoes: true,
}); });
if (lastDisplayedIndex === null) { if (lastDisplayedIndex === null) {
@ -1128,7 +1122,6 @@ const TimelinePanel = React.createClass({
_getLastDisplayedEventIndex: function(opts) { _getLastDisplayedEventIndex: function(opts) {
opts = opts || {}; opts = opts || {};
const ignoreOwn = opts.ignoreOwn || false; const ignoreOwn = opts.ignoreOwn || false;
const ignoreEchoes = opts.ignoreEchoes || false;
const allowPartial = opts.allowPartial || false; const allowPartial = opts.allowPartial || false;
const messagePanel = this.refs.messagePanel; const messagePanel = this.refs.messagePanel;
@ -1175,7 +1168,7 @@ const TimelinePanel = React.createClass({
adjacentInvisibleEventCount = 0; adjacentInvisibleEventCount = 0;
} }
const shouldIgnore = (ignoreEchoes && ev.status) || // local echo const shouldIgnore = !!ev.status || // local echo
(ignoreOwn && ev.sender && ev.sender.userId == myUserId); // own message (ignoreOwn && ev.sender && ev.sender.userId == myUserId); // own message
const isWithoutTile = !EventTile.haveTileForEvent(ev) || shouldHideEvent(ev); const isWithoutTile = !EventTile.haveTileForEvent(ev) || shouldHideEvent(ev);