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

fix(spec): remove unnecessary messages & prevent extra hot window

Browse source
This commit is contained in:
Evan Morikawa 2016-09-28 14:51:48 -04:00
parent 0e98736f49
commit 68b3ab4225
7 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec_integration/jasmine/bootstrap.js vendored
View file

@ -16,10 +16,6 @@ console.errorColor = function(err){
}
}
console.inspect = function(val) {
console.log(util.inspect(val, true, depth=7, colorize=true));
}
jasmine.NYLAS_ROOT_PATH = process.argv[3].split("NYLAS_ROOT_PATH=")[1]
jasmine.UNIT_TEST_TIMEOUT = 120*1000;
jasmine.BOOT_TIMEOUT = 30*1000;

1
src/browser/application.es6
View file

@ -61,6 +61,7 @@ export default class Application extends EventEmitter {
configDirPath: this.configDirPath,
config: this.config,
devMode: this.devMode,
specMode: this.specMode,
safeMode: this.safeMode,
initializeInBackground: initializeInBackground,
});

1
src/browser/auto-update-manager.es6
View file

@ -89,6 +89,7 @@ export default class AutoUpdateManager extends EventEmitter {
}
autoUpdater.on('error', (event, message) => {
if (this.specMode) return false;
console.error(`Error Downloading Update: ${message}`);
this.setState(ErrorState);
});

5
src/browser/main.js
View file

@ -1,6 +1,11 @@
/* eslint dot-notation: 0 */
/* eslint global-require: 0 */
global.shellStartTime = Date.now();
var util = require('util')
console.inspect = function consoleInspect(val) {
console.log(util.inspect(val, true, depth=7, colorize=true));
}
const app = require('electron').app;
const path = require('path');

3
src/browser/window-launcher.es6
View file

@ -16,7 +16,7 @@ let winNum = 0;
export default class WindowLauncher {
static EMPTY_WINDOW = "emptyWindow"
constructor({devMode, safeMode, resourcePath, configDirPath, onCreatedHotWindow, config}) {
constructor({devMode, safeMode, specMode, resourcePath, configDirPath, onCreatedHotWindow, config}) {
this.defaultWindowOpts = {
frame: process.platform !== "darwin",
hidden: false,
@ -31,6 +31,7 @@ export default class WindowLauncher {
}
this.config = config;
this.onCreatedHotWindow = onCreatedHotWindow;
if (specMode) return;
this.createHotWindow();
}

4
src/browser/window-manager.es6
View file

@ -9,7 +9,7 @@ const ONBOARDING_WINDOW = "onboarding"
export default class WindowManager {
constructor({devMode, safeMode, resourcePath, configDirPath, initializeInBackground, config}) {
constructor({devMode, safeMode, specMode, resourcePath, configDirPath, initializeInBackground, config}) {
this.initializeInBackground = initializeInBackground;
this._windows = {};
@ -17,7 +17,7 @@ export default class WindowManager {
this._registerWindow(win);
this._didCreateNewWindow(win);
}
this.windowLauncher = new WindowLauncher({devMode, safeMode, resourcePath, configDirPath, config, onCreatedHotWindow});
this.windowLauncher = new WindowLauncher({devMode, safeMode, specMode, resourcePath, configDirPath, config, onCreatedHotWindow});
}
get(windowKey) {

8
static/index.js
View file

@ -2,13 +2,19 @@ window.eval = global.eval = function() {
throw new Error("Sorry, N1 does not support window.eval() for security reasons.");
}
var util = require('util')
var path = require('path');
var electron = require('electron');
var remote = electron.remote;
console.inspect = function consoleInspect(val) {
console.log(util.inspect(val, true, depth=7, colorize=true));
}
function setLoadTime (loadTime) {
if (global.NylasEnv) {
global.NylasEnv.loadTime = loadTime
global.NylasEnv.loadTime = loadTime;
if (NylasEnv.inSpecMode()) return;
console.log('Window load time: ' + global.NylasEnv.getWindowLoadTime() + 'ms')
}
}