Do not send the room with action

By not sending the room with the action, we prevent its state from being updated by registered views listening for on_room_read
pull/21833/head
Luke Barnard 2017-03-28 11:26:40 +01:00
parent f4dc7ae8b1
commit 4a0988f83e
2 changed files with 5 additions and 4 deletions

View File

@ -476,9 +476,10 @@ var TimelinePanel = React.createClass({
// if we are scrolled to the bottom, do a quick-reset of our unreadNotificationCount // 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. // to avoid having to wait from the remote echo from the homeserver.
if (this.isAtEndOfLiveTimeline()) { if (this.isAtEndOfLiveTimeline()) {
this.props.timelineSet.room.setUnreadNotificationCount('total', 0);
this.props.timelineSet.room.setUnreadNotificationCount('highlight', 0);
dis.dispatch({ dis.dispatch({
action: 'on_room_read', action: 'on_room_read',
room: this.props.timelineSet.room,
}); });
} }

View File

@ -97,9 +97,9 @@ module.exports = React.createClass({
} }
break; break;
case 'on_room_read': case 'on_room_read':
payload.room.setUnreadNotificationCount('total', 0); // Force an update because the notif count state is too deep to cause
payload.room.setUnreadNotificationCount('highlight', 0); // an update. This forces the local echo of reading notifs to be
// Force an update because this state is too deep to cause an update // reflected by the RoomTiles.
this.forceUpdate(); this.forceUpdate();
break; break;
} }