imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename

Browse source
This commit is contained in:
David Baker 2019-03-11 11:38:54 +00:00
parent 999ebe6a19
commit ce9f3d8a57
3 changed files with 50 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -451,12 +451,12 @@ var TimelinePanel = React.createClass({
//
// 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
// more than the timeout on userCurrentlyPassive.
// more than the timeout on userRecentlyActive.
//
const myUserId = MatrixClientPeg.get().credentials.userId;
const sender = ev.sender ? ev.sender.userId : null;
var callRMUpdated = false;
if (sender != myUserId && !UserActivity.sharedInstance().userCurrentlyPassive()) {
if (sender != myUserId && !UserActivity.sharedInstance().userRecentlyActive()) {
updatedState.readMarkerVisible = true;
} else if (lastEv && this.getReadMarkerPosition() === 0) {
// we know we're stuckAtBottom, so we can advance the RM