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

let settled accept multiple proms + i18n

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2020-04-08 20:12:05 +01:00
parent 2837c41ca4
commit f6ad5bf54c
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/vector/index.ts
View file

@ -33,11 +33,13 @@ if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('sw.js');
}
async function settled(prom: Promise<any>) {
try {
await prom;
} catch (e) {
console.error(e);
async function settled(...promises: Array<Promise<any>>) {
for (const prom of promises) {
try {
await prom;
} catch (e) {
console.error(e);
}
}
}
@ -141,9 +143,7 @@ async function start() {
const loadSkinPromise = loadSkin();
// await things settling so that any errors we have to render have features like i18n running
await settled(loadSkinPromise);
await settled(loadThemePromise);
await settled(loadLanguagePromise);
await settled(loadSkinPromise, loadThemePromise, loadLanguagePromise);
// ##########################
// error handling begins here
@ -173,7 +173,7 @@ async function start() {
// await things starting successfully
// ##################################
await loadOlmPromise;
await settled(loadSkinPromise);
await loadSkinPromise;
await loadThemePromise;
await loadLanguagePromise;