From bef7179ca6e3d1cc89a3d2b6f110f2fa7f6b9013 Mon Sep 17 00:00:00 2001 From: ppot Date: Fri, 2 Jun 2017 20:59:06 -0400 Subject: [PATCH 1/2] use speard for menu building --- app/menus/menu.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/menus/menu.js b/app/menus/menu.js index 1d4851805df8..c406586213ab 100644 --- a/app/menus/menu.js +++ b/app/menus/menu.js @@ -12,7 +12,6 @@ const darwinMenu = require('./menus/darwin'); module.exports = (createWindow, updatePlugins) => { const commands = getKeymaps().commands; const menu = [ - (process.platform === 'darwin' ? darwinMenu(commands) : []), shellMenu(commands, createWindow), editMenu(commands), viewMenu(commands), @@ -21,5 +20,5 @@ module.exports = (createWindow, updatePlugins) => { helpMenu(commands) ]; - return menu; + return (process.platform === 'darwin' ? [darwinMenu(commands), ...menu] : menu); }; From b1db5c3ced4d75706a795e84aff3a136f0a3bb34 Mon Sep 17 00:00:00 2001 From: ppot Date: Sat, 3 Jun 2017 15:09:42 -0400 Subject: [PATCH 2/2] update --- app/menus/menu.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/menus/menu.js b/app/menus/menu.js index c406586213ab..463a8d7bcf6e 100644 --- a/app/menus/menu.js +++ b/app/menus/menu.js @@ -12,6 +12,7 @@ const darwinMenu = require('./menus/darwin'); module.exports = (createWindow, updatePlugins) => { const commands = getKeymaps().commands; const menu = [ + ...(process.platform === 'darwin' ? [darwinMenu(commands)] : []), shellMenu(commands, createWindow), editMenu(commands), viewMenu(commands), @@ -20,5 +21,5 @@ module.exports = (createWindow, updatePlugins) => { helpMenu(commands) ]; - return (process.platform === 'darwin' ? [darwinMenu(commands), ...menu] : menu); + return menu; };