From f60ac2aa5f55feeca787a77e991059d25f3964a1 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 9 Mar 2016 07:52:45 +0000
Subject: [PATCH] Make jump-to-read-marker work when the RM event isn't loaded.
If the event corresponding to the read-up-to mark hasn't been loaded into the
timeline window, we can't simply scroll to it. Instead, reload the timeline,
centered on the RM event.
Fixes https://github.com/vector-im/vector-web/issues/1055
---
src/components/structures/TimelinePanel.js | 24 +++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index ff4df26179..03667046f0 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -393,11 +393,29 @@ var TimelinePanel = React.createClass({
/* scroll to show the read-up-to marker
*/
jumpToReadMarker: function() {
- if (!this.state.readMarkerEventId)
- return;
if (!this.refs.messagePanel)
return;
- this.refs.messagePanel.scrollToEvent(this.state.readMarkerEventId);
+
+ if (!this.state.readMarkerEventId)
+ return;
+
+ // we may not have loaded the event corresponding to the read-marker
+ // into the _timelineWindow. In that case, attempts to scroll to it
+ // will fail.
+ //
+ // a quick way to figure out if we've loaded the relevant event is
+ // simply to check if the messagepanel knows where the read-marker is.
+ var ret = this.refs.messagePanel.getReadMarkerPosition();
+ if (ret !== null) {
+ // The messagepanel knows where the RM is, so we must have loaded
+ // the relevant event.
+ this.refs.messagePanel.scrollToEvent(this.state.readMarkerEventId);
+ }
+
+ // Looks like we haven't loaded the event corresponding to the read-marker.
+ // As with jumpToLiveTimeline, we want to reload the timeline around the
+ // read-marker.
+ this._loadTimeline(this.state.readMarkerEventId);
},