github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: register accelerator if role has no registerAccelerator (backport: 4-0-x) (#16314)

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-08 13:09:45 -05:00
committed by John Kleinschmidt
parent bad9ff6571
commit 0b6cc93896
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

@@ -248,7 +248,8 @@ exports.getDefaultAccelerator = (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) => {