imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into travis/cors-on-join

Browse source
This commit is contained in:
Travis Ralston 2018-12-05 11:30:19 -07:00 • committed by GitHub
commit c46bae59b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 2331 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/stores/GroupStore.js
View file

@ -122,10 +122,6 @@ class GroupStore extends EventEmitter {
);
},
};
this.on('error', (err, groupId) => {
console.error(`GroupStore encountered error whilst fetching data for ${groupId}`, err);
});
}
_fetchResource(stateKey, groupId) {
@ -148,7 +144,7 @@ class GroupStore extends EventEmitter {
}
console.error(`Failed to get resource ${stateKey} for ${groupId}`, err);
this.emit('error', err, groupId);
this.emit('error', err, groupId, stateKey);
}).finally(() => {
// Indicate finished request, allow for future fetches
delete this._fetchResourcePromise[stateKey][groupId];