Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make room-switching quicker

Browse Source 
Avoid delaying a reactor tick when switching rooms, to make room-switching
(feel) a bit snappier.
This commit is contained in:
Richard van der Hoff 2016-02-26 12:25:46 +00:00
parent 2bd6529ca0
commit 0d1c85eb7c
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,29 +442,33 @@ var TimelinePanel = React.createClass({
* returns a promise which will resolve when the load completes. * returns a promise which will resolve when the load completes.
*/ */
_loadTimeline: function(eventId, pixelOffset) { _loadTimeline: function(eventId, pixelOffset) {
// TODO: we could optimise this, by not resetting the window if the this._timelineWindow = new Matrix.TimelineWindow(
// event is in the current window (though it's not obvious how we can MatrixClientPeg.get(), this.props.room,
// tell if the current window is on the live event stream) {windowLimit: TIMELINE_CAP});
var prom = this._timelineWindow.load(eventId, INITIAL_SIZE);
this.setState({ this.setState({
events: [], events: [],
timelineLoading: true, timelineLoading: true,
}); });
this._timelineWindow = new Matrix.TimelineWindow( // if we already have the event in question, TimelineWindow.load
MatrixClientPeg.get(), this.props.room, // returns a resolved promise.
{windowLimit: TIMELINE_CAP}); //
// In this situation, we don't really want to defer the update of the
// state to the next event loop, because it makes room-switching feel
// quite slow. So we detect that situation and shortcut straight to
// calling _onTimelineUpdated and updating the state.
return this._timelineWindow.load(eventId, INITIAL_SIZE).then(() => { var onLoaded = () => {
debuglog("TimelinePanel: timeline loaded");
this._onTimelineUpdated(true); this._onTimelineUpdated(true);
}).finally(() => {
this.setState({ this.setState({timelineLoading: false}, () => {
timelineLoading: false,
}, () => {
// initialise the scroll state of the message panel // initialise the scroll state of the message panel
if (!this.refs.messagePanel) { if (!this.refs.messagePanel) {
// this shouldn't happen. // this shouldn't happen - _onTimelineUpdated checks we're
// mounted, and timelineLoading is now false.
console.log("can't initialise scroll state because " + console.log("can't initialise scroll state because " +
"messagePanel didn't load"); "messagePanel didn't load");
return; return;
@ -478,7 +482,15 @@ var TimelinePanel = React.createClass({
this.sendReadReceipt(); this.sendReadReceipt();
this.updateReadMarker(); this.updateReadMarker();
}); });
}); };
if (prom.isPending()) {
prom = prom.then(onLoaded);
} else {
onLoaded();
}
prom.done();
}, },
_onTimelineUpdated: function(gotResults) { _onTimelineUpdated: function(gotResults) {