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

Don't overwrite existing fields when build menu from template.

Browse source
This commit is contained in:
Cheng Zhao 2013-08-15 16:09:34 +08:00
parent c858066709
commit c700d291e5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser/api/lib/menu-item.coffee
View file

@ -6,7 +6,7 @@ class MenuItem
constructor: (options) -> constructor: (options) ->
Menu = require 'menu' Menu = require 'menu'
{click, selector, @type, @label, @sublabel, @accelerator, @enabled, @visible, @checked, @groupId, @submenu} = options {click, @selector, @type, @label, @sublabel, @accelerator, @enabled, @visible, @checked, @groupId, @submenu} = options
@type = 'submenu' if not @type? and @submenu? @type = 'submenu' if not @type? and @submenu?
throw new Error('Invalid submenu') if @type is 'submenu' and @submenu?.constructor isnt Menu throw new Error('Invalid submenu') if @type is 'submenu' and @submenu?.constructor isnt Menu

2
browser/api/lib/menu.coffee
View file

@ -58,7 +58,7 @@ Menu.buildFromTemplate = (template) ->
item.submenu = Menu.buildFromTemplate item.submenu if item.submenu? item.submenu = Menu.buildFromTemplate item.submenu if item.submenu?
menuItem = new MenuItem(item) menuItem = new MenuItem(item)
menuItem[key] = value for key, value of item menuItem[key] = value for key, value of item when not menuItem[key]?
menu.append menuItem menu.append menuItem