mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Empty objects within default menu replaced by nulls

Browse source
This commit is contained in:
mst128256 2017-03-29 12:17:50 +02:00
parent 6a7b4feb35
commit 6ae198a625
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/browser/api/menu-item-roles.js
View file

@ -180,7 +180,7 @@ const roles = {
process.platform === 'darwin' ? { process.platform === 'darwin' ? {
role: 'pasteandmatchstyle' role: 'pasteandmatchstyle'
} : {}, } : null,
{ {
role: 'delete' role: 'delete'
@ -188,7 +188,7 @@ const roles = {
process.platform === 'win32' ? { process.platform === 'win32' ? {
type: 'separator' type: 'separator'
} : {}, } : null,
{ {
role: 'selectall' role: 'selectall'
@ -209,12 +209,11 @@ const roles = {
process.platform === 'darwin' ? { process.platform === 'darwin' ? {
type: 'separator' type: 'separator'
} : {}, } : null,
process.platform === 'darwin' ? { process.platform === 'darwin' ? {
label: 'Bring All to Front',
role: 'front' role: 'front'
} : {} } : null
] ]
} }
@ -246,7 +245,7 @@ exports.getDefaultSubmenu = (role) => {
// remove empty objects from within the submenu // remove empty objects from within the submenu
if (Array.isArray(submenu)) { if (Array.isArray(submenu)) {
submenu = submenu.filter(function (n) { submenu = submenu.filter(function (n) {
return n.constructor !== Object || Object.keys(n).length > 0 return n != null
}) })
} }