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

fix: register accelerator if role has no registerAccelerator (backport: 3-1-x) (#16598)

Browse source 
* fix: register accelerator if role has no registerAccelerator

* ensure roles[role].registerAccelerator is defined
This commit is contained in:
trop[bot] 2019-01-29 22:11:47 -08:00 • committed by Shelley Vohr
parent ce33169b71
commit 3b61384c26
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -246,7 +246,8 @@ exports.getDefaultAccelerator = (role) => {
} }
exports.shouldRegisterAccelerator = (role) => { exports.shouldRegisterAccelerator = (role) => {
return roles.hasOwnProperty(role) ? roles[role].registerAccelerator : true const hasRoleRegister = roles.hasOwnProperty(role) && roles[role].registerAccelerator !== undefined
return hasRoleRegister ? roles[role].registerAccelerator : true
} }
exports.getDefaultSubmenu = (role) => { exports.getDefaultSubmenu = (role) => {