Only clear the local notification count if needed
Only zero the local notification count when we actually send a read receipt, otherwise we cause a re-render of the RoomList every time the user moves the cursor in the window, basically.pull/21833/head
parent
e90897d117
commit
3373f00d90
|
@ -473,16 +473,6 @@ var TimelinePanel = React.createClass({
|
||||||
// we still have a client.
|
// we still have a client.
|
||||||
if (!MatrixClientPeg.get()) return;
|
if (!MatrixClientPeg.get()) return;
|
||||||
|
|
||||||
// if we are scrolled to the bottom, do a quick-reset of our unreadNotificationCount
|
|
||||||
// to avoid having to wait from the remote echo from the homeserver.
|
|
||||||
if (this.isAtEndOfLiveTimeline()) {
|
|
||||||
this.props.timelineSet.room.setUnreadNotificationCount('total', 0);
|
|
||||||
this.props.timelineSet.room.setUnreadNotificationCount('highlight', 0);
|
|
||||||
dis.dispatch({
|
|
||||||
action: 'on_room_read',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
var currentReadUpToEventId = this._getCurrentReadReceipt(true);
|
var currentReadUpToEventId = this._getCurrentReadReceipt(true);
|
||||||
var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
|
var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
|
||||||
|
|
||||||
|
@ -520,6 +510,14 @@ var TimelinePanel = React.createClass({
|
||||||
// it failed, so allow retries next time the user is active
|
// it failed, so allow retries next time the user is active
|
||||||
this.last_rr_sent_event_id = undefined;
|
this.last_rr_sent_event_id = undefined;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// do a quick-reset of our unreadNotificationCount to avoid having
|
||||||
|
// to wait from the remote echo from the homeserver.
|
||||||
|
this.props.timelineSet.room.setUnreadNotificationCount('total', 0);
|
||||||
|
this.props.timelineSet.room.setUnreadNotificationCount('highlight', 0);
|
||||||
|
dis.dispatch({
|
||||||
|
action: 'on_room_read',
|
||||||
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue