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

ignore set menu item fields

Browse source
This commit is contained in:
Zeke Sikelianos 2016-03-17 16:20:23 -07:00
parent e9ba5abe03
commit 344dda4029
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -269,7 +269,7 @@ Menu.getApplicationMenu = function() {
Menu.sendActionToFirstResponder = bindings.sendActionToFirstResponder; Menu.sendActionToFirstResponder = bindings.sendActionToFirstResponder;
Menu.buildFromTemplate = function(template) { Menu.buildFromTemplate = function(template) {
var insertIndex, item, j, k, key, len, len1, menu, menuItem, positionedTemplate, value; var insertIndex, item, j, k, key, len, len1, menu, menuItem, positionedTemplate;
if (!Array.isArray(template)) { if (!Array.isArray(template)) {
throw new TypeError('Invalid template for Menu'); throw new TypeError('Invalid template for Menu');
} }
@ -293,9 +293,9 @@ Menu.buildFromTemplate = function(template) {
} }
menuItem = new MenuItem(item); menuItem = new MenuItem(item);
for (key in item) { for (key in item) {
value = item[key]; // Preserve extra fields specified by user
if (menuItem[key] == null) { if (!menuItem.hasOwnProperty(key)) {
menuItem[key] = value; menuItem[key] = item[key];
} }
} }
menu.append(menuItem); menu.append(menuItem);