Skip to content

Commit 3f58302

Browse files
committed
move intialize code from 'did-finish-load'
1 parent 63b199c commit 3f58302

1 file changed

Lines changed: 38 additions & 38 deletions

File tree

atom-lib/finder-window.js

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -100,49 +100,49 @@ finderWindow.on('close', function (e) {
100100
finderWindow.hide()
101101
})
102102

103-
finderWindow.webContents.on('did-finish-load', function () {
104-
var appIcon = new Tray(path.join(__dirname, '../resources/tray-icon.png'))
105-
appIcon.setToolTip('Boost')
106-
107-
var trayMenu = new Menu()
108-
trayMenu.append(new MenuItem({
109-
label: 'Open Main window',
110-
click: function () {
111-
emit('show-main-window')
112-
}
113-
}))
114-
trayMenu.append(new MenuItem({
115-
label: 'Open Finder window',
116-
click: function () {
117-
openFinder()
118-
}
119-
}))
120-
trayMenu.append(new MenuItem({
121-
label: 'Quit',
122-
click: function () {
123-
emit('quit-app')
124-
}
125-
}))
126-
127-
appIcon.setContextMenu(trayMenu)
128-
appIcon.on('click', function (e) {
129-
e.preventDefault()
130-
appIcon.popUpContextMenu(trayMenu)
131-
})
132-
133-
ipcMain.on('copy-finder', function () {
134-
emit('copy-finder')
135-
})
136-
137-
ipcMain.on('hide-finder', function () {
138-
hideFinder()
139-
})
103+
var appIcon = new Tray(path.join(__dirname, '../resources/tray-icon.png'))
104+
appIcon.setToolTip('Boost')
105+
106+
var trayMenu = new Menu()
107+
trayMenu.append(new MenuItem({
108+
label: 'Open Main window',
109+
click: function () {
110+
emit('show-main-window')
111+
}
112+
}))
113+
trayMenu.append(new MenuItem({
114+
label: 'Open Finder window',
115+
click: function () {
116+
openFinder()
117+
}
118+
}))
119+
trayMenu.append(new MenuItem({
120+
label: 'Quit',
121+
click: function () {
122+
emit('quit-app')
123+
}
124+
}))
125+
126+
appIcon.setContextMenu(trayMenu)
127+
appIcon.on('click', function (e) {
128+
e.preventDefault()
129+
appIcon.popUpContextMenu(trayMenu)
130+
})
140131

132+
ipcMain.on('copy-finder', function () {
133+
emit('copy-finder')
134+
})
135+
136+
ipcMain.on('hide-finder', function () {
137+
hideFinder()
138+
})
139+
140+
finderWindow.webContents.on('did-finish-load', function () {
141141
isFinderLoaded = true
142142
})
143143

144144
function openFinder () {
145-
finderWindow.show()
145+
if (isFinderLoaded) finderWindow.show()
146146
}
147147
function hideFinder () {
148148
if (process.platform === 'win32') {

0 commit comments

Comments
 (0)