rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace a .then() with await Promise.all()

Browse source
This commit is contained in:
groovecoder 2017-06-15 11:23:39 -05:00 • committed by Jonathan Kingston
parent 5237e67fa6
commit 4ed136299b
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
webextension/js/popup.js
View file

@ -72,7 +72,7 @@ const Logic = {
_panels: {},
_onboardingVariation: null,
init() {
async init() {
// Remove browserAction "upgraded" badge when opening panel
this.clearBrowserActionBadge();
@ -81,26 +81,26 @@ const Logic = {
// Get the onboarding variation
const variationPromise = this.getShieldStudyVariation();
// Routing to the correct panel.
Promise.all([identitiesPromise, variationPromise])
.then(() => {
// If localStorage is disabled, we don't show the onboarding.
if (!localStorage || localStorage.getItem("onboarded4")) {
this.showPanel(P_CONTAINERS_LIST);
} else if (localStorage.getItem("onboarded3")) {
this.showPanel(P_ONBOARDING_4);
} else if (localStorage.getItem("onboarded2")) {
this.showPanel(P_ONBOARDING_3);
} else if (localStorage.getItem("onboarded1")) {
this.showPanel(P_ONBOARDING_2);
} else {
this.showPanel(P_ONBOARDING_1);
}
})
try {
await Promise.all([identitiesPromise, variationPromise]);
} catch(e) {
throw new Error("Failed to retrieve the identities or variation. We cannot continue. ", e.message);
}
// Routing to the correct panel.
// If localStorage is disabled, we don't show the onboarding.
if (!localStorage || localStorage.getItem("onboarded4")) {
this.showPanel(P_CONTAINERS_LIST);
} else if (localStorage.getItem("onboarded3")) {
this.showPanel(P_ONBOARDING_4);
} else if (localStorage.getItem("onboarded2")) {
this.showPanel(P_ONBOARDING_3);
} else if (localStorage.getItem("onboarded1")) {
this.showPanel(P_ONBOARDING_2);
} else {
this.showPanel(P_ONBOARDING_1);
}
.catch(() => {
throw new Error("Failed to retrieve the identities. We cannot continue.");
});
},
async clearBrowserActionBadge() {