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

🎨(loading): Remove supplement text

Browse source
This commit is contained in:
Jackie Luo 2016-06-13 16:32:46 -07:00
parent 9661430268
commit 4ea106db3e
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/browser/application.es6
View file

@ -189,13 +189,13 @@ export default class Application extends EventEmitter {
app.commandLine.appendSwitch('js-flags', '--harmony');
}
openWindowsForTokenState(loadingMessage) {
openWindowsForTokenState() {
const accounts = this.config.get('nylas.accounts');
const hasAccount = accounts && accounts.length > 0;
const hasN1ID = this.config.get('nylas.identity.id');
if (hasAccount && hasN1ID) {
this.windowManager.ensureWindow(WindowManager.MAIN_WINDOW, {loadingMessage});
this.windowManager.ensureWindow(WindowManager.MAIN_WINDOW);
this.windowManager.ensureWindow(WindowManager.WORK_WINDOW);
} else {
this.windowManager.ensureWindow(WindowManager.ONBOARDING_WINDOW, {
@ -261,7 +261,7 @@ export default class Application extends EventEmitter {
this.windowManager.destroyAllWindows();
this._deleteDatabase(() => {
this.setDatabasePhase('setup');
this.openWindowsForTokenState("Please wait while we prepare new features.");
this.openWindowsForTokenState();
});
}, 0);
}

7
static/index.html
View file

File diff suppressed because one or more lines are too long

4
static/index.js
View file

@ -93,10 +93,6 @@ window.onload = function() {
throw error;
}
if (loadSettings.loadingMessage) {
document.getElementById("application-loading-text-supplement").innerHTML = loadSettings.loadingMessage
}
// Normalize to make sure drive letter case is consistent on Windows
process.resourcesPath = path.normalize(process.resourcesPath);