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

fix: Stricter Testing For Menu Items (#13992)

Browse source 
This PR includes stricter testing for empty objects so that false context menus are not created along with the tests to ensure future compatibility.
This commit is contained in:
Troy 2018-08-17 15:10:14 -05:00 • committed by Shelley Vohr
parent 76a592a419
commit 5ea05ddee7
3 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/browser/api/menu.js
View file

@ -156,25 +156,28 @@ Menu.setApplicationMenu = function (menu) {
Menu.buildFromTemplate = function (template) {
if (!Array.isArray(template)) {
throw new TypeError('Invalid template for Menu')
throw new TypeError('Invalid template for Menu: Menu template must be an array')
}
const menu = new Menu()
if (!areValidTemplateItems(template)) {
throw new TypeError('Invalid template for MenuItem: must have at least one of label, role or type')
}
const filtered = removeExtraSeparators(template)
const sorted = sortTemplate(filtered)
sorted.forEach((item) => {
if (typeof item !== 'object') {
throw new TypeError('Invalid template for MenuItem')
}
menu.append(new MenuItem(item))
})
sorted.forEach((item) => menu.append(new MenuItem(item)))
return menu
}
/* Helper Functions */
// validate the template against having the wrong attribute
function areValidTemplateItems (template) {
return template.every(item =>
item != null && typeof item === 'object' && (item.hasOwnProperty('label') || item.hasOwnProperty('role') || item.type === 'separator'))
}
function sortTemplate (template) {
const sorted = sortMenuItems(template)
for (let id in sorted) {