Skip to content

Commit f60befb

Browse files
authored
Merge pull request #56 from nexB/53-replace-default-menu-with-custom-menu
Replace default menu with existing custom menu
2 parents 82c5e69 + bb8f652 commit f60befb

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

main.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ function createWindow () {
2121
});
2222
}
2323

24-
app.on('ready', createWindow);
24+
app.on('ready', () => {
25+
createWindow();
26+
const menu = Menu.buildFromTemplate(getTemplate());
27+
Menu.setApplicationMenu(menu);
28+
});
2529
app.on('window-all-closed', function () {
2630
if (process.platform !== 'darwin') {
2731
app.quit();
@@ -33,11 +37,8 @@ app.on('activate', function () {
3337
}
3438
});
3539

36-
app.once('ready', function() {
37-
if (Menu.getApplicationMenu())
38-
return;
39-
40-
var template = [
40+
function getTemplate() {
41+
const template = [
4142
{
4243
label: 'Edit',
4344
submenu: [
@@ -168,7 +169,7 @@ app.once('ready', function() {
168169
]
169170
},
170171
];
171-
var pjson = require('./package.json');
172+
const pjson = require('./package.json');
172173

173174
if (process.platform == 'darwin') {
174175
template.unshift({
@@ -236,7 +237,5 @@ var pjson = require('./package.json');
236237
}
237238
);
238239
}
239-
240-
var menu = Menu.buildFromTemplate(template);
241-
Menu.setApplicationMenu(menu);
242-
});
240+
return template;
241+
}

0 commit comments

Comments
 (0)