matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge pull request #178 from matrix-org/rav/reset_timeline

Browse Source 
Reload the timeline when we get a gappy sync
This commit is contained in:
Richard van der Hoff
2016-02-26 13:28:20 +00:00
parent c4603d3474 4be29401ce
commit 65ecbf93fe
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/structures/TimelinePanel.js
View File

@@ -116,6 +116,7 @@ var TimelinePanel = React.createClass({
this.dispatcherRef = dis.register(this.onAction); this.dispatcherRef = dis.register(this.onAction);
MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline); MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
MatrixClientPeg.get().on("Room.timelineReset", this.onRoomTimelineReset);
MatrixClientPeg.get().on("Room.redaction", this.onRoomRedaction); MatrixClientPeg.get().on("Room.redaction", this.onRoomRedaction);
this._initTimeline(this.props); this._initTimeline(this.props);
@@ -145,6 +146,7 @@ var TimelinePanel = React.createClass({
var client = MatrixClientPeg.get(); var client = MatrixClientPeg.get();
if (client) { if (client) {
client.removeListener("Room.timeline", this.onRoomTimeline); client.removeListener("Room.timeline", this.onRoomTimeline);
client.removeListener("Room.timelineReset", this.onRoomTimelineReset);
client.removeListener("Room.redaction", this.onRoomRedaction); client.removeListener("Room.redaction", this.onRoomRedaction);
} }
}, },
@@ -242,6 +244,14 @@ var TimelinePanel = React.createClass({
} }
}, },
onRoomTimelineReset: function(room) {
if (room !== this.props.room) return;
if (this.refs.messagePanel && this.refs.messagePanel.isAtBottom()) {
this._loadTimeline();
}
},
onRoomRedaction: function(ev, room) { onRoomRedaction: function(ev, room) {
if (this.unmounted) return; if (this.unmounted) return;