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 branch 'develop' into t3chguy/remove_bluebird

Browse Source
This commit is contained in:
Michael Telatynski
2019-11-20 15:21:23 +00:00
committed by GitHub
parent e144f1c368 1e6472723a
commit 6121420113
47 changed files with 1838 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1075,6 +1075,7 @@ const TimelinePanel = createReactClass({
if (timeline) {
// This is a hot-path optimization by skipping a promise tick
// by repeating a no-op sync branch in TimelineSet.getTimelineForEvent & MatrixClient.getEventTimeline
this._timelineWindow.load(eventId, INITIAL_SIZE); // in this branch this method will happen in sync time
onLoaded();
} else {
const prom = this._timelineWindow.load(eventId, INITIAL_SIZE);