mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-25 02:35:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-11-08 11:36:35 +00:00
commit 63c8d676cf
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/stores/FlairStore.js
View file

@ -69,9 +69,13 @@ class FlairStore extends EventEmitter {
} }
// Bulk lookup ongoing, return promise to resolve/reject // Bulk lookup ongoing, return promise to resolve/reject
if (this._usersPending[userId] || this._usersInFlight[userId]) { if (this._usersPending[userId]) {
return this._usersPending[userId].prom; return this._usersPending[userId].prom;
} }
// User has been moved from pending to in-flight
if (this._usersInFlight[userId]) {
return this._usersInFlight[userId].prom;
}
this._usersPending[userId] = {}; this._usersPending[userId] = {};
this._usersPending[userId].prom = new Promise((resolve, reject) => { this._usersPending[userId].prom = new Promise((resolve, reject) => {