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

Merge pull request #244 from matrix-org/rav/no_rm_on_my_events

Browse source 
Move read-marker past our own events when we switch to a room
This commit is contained in:
Richard van der Hoff 2016-03-22 17:44:02 +00:00
commit 7fb5736e52
2 changed files with 69 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -343,8 +343,6 @@ var TimelinePanel = React.createClass({
return;
}
var currentIndex = this._indexForEventId(this.state.readMarkerEventId);
// 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
// message which doesn't fit on the screen.
@ -375,6 +373,38 @@ var TimelinePanel = React.createClass({
}
},
// advance the read marker past any events we sent ourselves.
_advanceReadMarkerPastMyEvents: function() {
// we call _timelineWindow.getEvents() rather than using
// this.state.events, because react batches the update to the latter, so it
// may not have been updated yet.
var events = this._timelineWindow.getEvents();
// first find where the current RM is
for (var i = 0; i < events.length; i++) {
if (events[i].getId() == this.state.readMarkerEventId)
break;
}
if (i >= events.length) {
return;
}
// now think about advancing it
var myUserId = MatrixClientPeg.get().credentials.userId;
for (; i < events.length; i++) {
var ev = events[i];
if (!ev.sender || ev.sender.userId != myUserId) {
break;
}
}
// i is now the first unread message which we didn't send ourselves.
i--;
var ev = events[i];
this._setReadMarker(ev.getId(), ev.getTs());
},
/* jump down to the bottom of this room, where new events are arriving
*/
jumpToLiveTimeline: function() {
@ -527,6 +557,11 @@ var TimelinePanel = React.createClass({
var onLoaded = () => {
this._reloadEvents();
// If we switched away from the room while there were pending
// outgoing events, the read-marker will be before those events.
// We need to skip over any which have subsequently been sent.
this._advanceReadMarkerPastMyEvents();
this.setState({timelineLoading: false}, () => {
// initialise the scroll state of the message panel
if (!this.refs.messagePanel) {