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

Merge branch 'dbkr/fix_instant_rrs_pt2' of github.com:matrix-org/matrix-react-sdk into dbkr/fix_instant_rrs_pt2

Browse source
This commit is contained in:
David Baker 2019-03-12 10:29:44 +00:00
commit 9f4de60f9b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -452,12 +452,12 @@ var TimelinePanel = React.createClass({
// //
// We ignore events we have sent ourselves; we don't want to see the // We ignore events we have sent ourselves; we don't want to see the
// read-marker when a remote echo of an event we have just sent takes // read-marker when a remote echo of an event we have just sent takes
// more than the timeout on userRecentlyActive. // more than the timeout on userActiveRecently.
// //
const myUserId = MatrixClientPeg.get().credentials.userId; const myUserId = MatrixClientPeg.get().credentials.userId;
const sender = ev.sender ? ev.sender.userId : null; const sender = ev.sender ? ev.sender.userId : null;
var callRMUpdated = false; var callRMUpdated = false;
if (sender != myUserId && !UserActivity.sharedInstance().userRecentlyActive()) { if (sender != myUserId && !UserActivity.sharedInstance().userActiveRecently()) {
updatedState.readMarkerVisible = true; updatedState.readMarkerVisible = true;
} else if (lastEv && this.getReadMarkerPosition() === 0) { } else if (lastEv && this.getReadMarkerPosition() === 0) {
// we know we're stuckAtBottom, so we can advance the RM // we know we're stuckAtBottom, so we can advance the RM