Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-22 00:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(onboarding): Fix Rx.Observable.fromQuery not defined bug

Browse source
This commit is contained in:
Evan Morikawa 2016-07-11 18:07:45 -07:00
parent bd361c8abb
commit 2474b0e7d3
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
internal_packages/onboarding/lib/onboarding-store.es6
View file

@ -40,6 +40,7 @@ class OnboardingStore extends NylasStore {
}
if (existingAccount) {
// Used when re-adding an account after re-connecting
const accountType = accountTypeForProvider(existingAccount.provider);
this._pageStack = ['account-choose']
this._accountInfo = {
@ -48,8 +49,18 @@ class OnboardingStore extends NylasStore {
};
this._onSetAccountType(accountType);
} else if (addingAccount) {
// Adding a new, unknown account
this._pageStack = ['account-choose'];
} else if (identity) {
// Should only happen if config was edited to remove all accounts,
// but don't want to re-login to Nylas account. Very useful when
// switching environments.
this._pageStack = ['account-choose'];
} else {
// Standard new user onboarding flow.
// Note: If accounts are already connected, but no Nylas ID is, then
// the welcome page will show a separate page for returning users to
// create a Nylas Pro ID.
this._pageStack = ['welcome'];
}
}

1
src/nylas-env.coffee
View file

@ -681,6 +681,7 @@ class NylasEnvConstructor
# hot windows), the packages won't be loaded until `populateHotWindow`
# gets fired.
startSecondaryWindow: ->
@extendRxObservables()
document.getElementById("application-loading-cover")?.remove()
@startWindow()
@initializeBasicSheet()