From 3f58302a143f981fe936c886d3d3f8327d9fb4fe Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Tue, 22 Dec 2015 16:07:00 +0900 Subject: [PATCH] move intialize code from 'did-finish-load' --- atom-lib/finder-window.js | 76 +++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/atom-lib/finder-window.js b/atom-lib/finder-window.js index bfeb43fc..d29a73a0 100644 --- a/atom-lib/finder-window.js +++ b/atom-lib/finder-window.js @@ -100,49 +100,49 @@ finderWindow.on('close', function (e) { finderWindow.hide() }) +var appIcon = new Tray(path.join(__dirname, '../resources/tray-icon.png')) +appIcon.setToolTip('Boost') + +var trayMenu = new Menu() +trayMenu.append(new MenuItem({ + label: 'Open Main window', + click: function () { + emit('show-main-window') + } +})) +trayMenu.append(new MenuItem({ + label: 'Open Finder window', + click: function () { + openFinder() + } +})) +trayMenu.append(new MenuItem({ + label: 'Quit', + click: function () { + emit('quit-app') + } +})) + +appIcon.setContextMenu(trayMenu) +appIcon.on('click', function (e) { + e.preventDefault() + appIcon.popUpContextMenu(trayMenu) +}) + +ipcMain.on('copy-finder', function () { + emit('copy-finder') +}) + +ipcMain.on('hide-finder', function () { + hideFinder() +}) + finderWindow.webContents.on('did-finish-load', function () { - var appIcon = new Tray(path.join(__dirname, '../resources/tray-icon.png')) - appIcon.setToolTip('Boost') - - var trayMenu = new Menu() - trayMenu.append(new MenuItem({ - label: 'Open Main window', - click: function () { - emit('show-main-window') - } - })) - trayMenu.append(new MenuItem({ - label: 'Open Finder window', - click: function () { - openFinder() - } - })) - trayMenu.append(new MenuItem({ - label: 'Quit', - click: function () { - emit('quit-app') - } - })) - - appIcon.setContextMenu(trayMenu) - appIcon.on('click', function (e) { - e.preventDefault() - appIcon.popUpContextMenu(trayMenu) - }) - - ipcMain.on('copy-finder', function () { - emit('copy-finder') - }) - - ipcMain.on('hide-finder', function () { - hideFinder() - }) - isFinderLoaded = true }) function openFinder () { - finderWindow.show() + if (isFinderLoaded) finderWindow.show() } function hideFinder () { if (process.platform === 'win32') {