From 26ce134de8d80fbf45431cb05509266324eb2060 Mon Sep 17 00:00:00 2001 From: zweicoder Date: Sat, 23 Jan 2016 15:10:02 +0800 Subject: [PATCH] Fix obsession with Mac --- app/src/components/mainWindow/mainWindow.js | 5 ++++- app/src/main.js | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/components/mainWindow/mainWindow.js b/app/src/components/mainWindow/mainWindow.js index d6b8e15..2068616 100644 --- a/app/src/components/mainWindow/mainWindow.js +++ b/app/src/components/mainWindow/mainWindow.js @@ -17,7 +17,10 @@ const ZOOM_INTERVAL = 0.1; * @param {electron.app.dock.setBadge} setDockBadge * @returns {electron.BrowserWindow} */ -function createMainWindow(options, onAppQuit, setDockBadge) { +function createMainWindow(options, {quit: onAppQuit, dock}) { + if(dock){ + setDockBadge = dock.setBadge + } var mainWindowState = windowStateKeeper({ defaultWidth: options.width || 1280, defaultHeight: options.height || 800 diff --git a/app/src/main.js b/app/src/main.js index b8abbec..0d73fc7 100644 --- a/app/src/main.js +++ b/app/src/main.js @@ -46,7 +46,7 @@ app.on('before-quit', function () { }); app.on('ready', function () { - mainWindow = createMainWindow(appArgs, app.quit, app.dock.setBadge); + mainWindow = createMainWindow(appArgs, app); }); app.on('login', function(event, webContents, request, authInfo, callback) { @@ -59,6 +59,6 @@ ipcMain.on('notification', function(event, title, opts) { if (!isOSX() || mainWindow.isFocused()) { return; } - + console.log(isOSX()); app.dock.setBadge('●'); });