Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-03-02 02:53:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(win-manager): Replace sendToWindow, check for window first

Browse source
This commit is contained in:
Ben Gotow 2016-06-08 14:25:25 -07:00
parent a80545d2dc
commit 167416ee86
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/browser/application.es6
View file

@ -328,15 +328,18 @@ export default class Application extends EventEmitter {
});
this.on('application:new-message', () => {
this.windowManager.sendToWindow(WindowManager.MAIN_WINDOW, 'new-message');
const main = this.windowManager.get(WindowManager.MAIN_WINDOW);
if (main) { main.sendMessage('new-message') }
});
this.on('application:view-help', () => {
const helpUrl = 'https://nylas.zendesk.com/hc/en-us/sections/203638587-N1';
require('electron').shell.openExternal(helpUrl);
});
this.on('application:open-preferences', () => {
this.windowManager.sendToWindow(WindowManager.MAIN_WINDOW, 'open-preferences');
const main = this.windowManager.get(WindowManager.MAIN_WINDOW);
if (main) { main.sendMessage('open-preferences') }
});
this.on('application:show-main-window', () => {
@ -663,14 +666,16 @@ export default class Application extends EventEmitter {
openUrl(urlToOpen) {
const {protocol} = url.parse(urlToOpen);
if (protocol === 'mailto:') {
this.windowManager.sendToWindow(WindowManager.MAIN_WINDOW, 'mailto', urlToOpen);
const main = this.windowManager.get(WindowManager.MAIN_WINDOW);
if (main) { main.sendMessage('mailto', urlToOpen) }
} else {
console.log(`Ignoring unknown URL type: ${urlToOpen}`);
}
}
openComposerWithFiles(pathsToOpen) {
this.windowManager.sendToWindow(WindowManager.MAIN_WINDOW, 'mailfiles', pathsToOpen);
const main = this.windowManager.get(WindowManager.MAIN_WINDOW);
if (main) { main.sendMessage('mailfiles', pathsToOpen) }
}
// Opens up a new {NylasWindow} to run specs within.

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

@ -111,13 +111,6 @@ export default class WindowManager {
}
}
sendToWindow(windowKey, ...args) {
if (!this._windows[windowKey]) {
throw new Error(`Can't find window: ${windowKey}`);
}
this._windows[windowKey].sendMessage(...args);
}
sendToAllWindows(msg, {except}, ...args) {
for (const windowKey of Object.keys(this._windows)) {
const win = this._windows[windowKey];