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

Make MenuItem's type default to 'submenu' if it has submenu property.

Browse source
This commit is contained in:
Cheng Zhao 2013-05-16 22:22:33 +08:00
parent c2f6676c62
commit e58f115b43
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
browser/api/lib/menu_item.coffee
View file

@ -4,8 +4,13 @@ class MenuItem
@types = ['normal', 'separator', 'submenu', 'checkbox', 'radio'] @types = ['normal', 'separator', 'submenu', 'checkbox', 'radio']
constructor: (options) -> constructor: (options) ->
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?
throw new Error('Invalid submenu') if @type is 'submenu' and @submenu?.constructor isnt Menu
@type = @type ? 'normal' @type = @type ? 'normal'
@label = @label ? '' @label = @label ? ''
@sublabel = @sublabel ? '' @sublabel = @sublabel ? ''
@ -13,13 +18,12 @@ class MenuItem
@visible = @visible ? true @visible = @visible ? true
throw new Error('Unknown menu type') if MenuItem.types.indexOf(@type) is -1 throw new Error('Unknown menu type') if MenuItem.types.indexOf(@type) is -1
throw new Error('Invalid menu') if @type is 'submenu' and @submenu?.constructor.name isnt 'Menu'
@commandId = ++nextCommandId @commandId = ++nextCommandId
@click = -> @click = ->
if typeof click is 'function' if typeof click is 'function'
click() click()
else if typeof selector is 'string' else if typeof selector is 'string'
require('menu').sendActionToFirstResponder selector Menu.sendActionToFirstResponder selector
module.exports = MenuItem module.exports = MenuItem

4
browser/default_app/main.js
View file

@ -72,8 +72,8 @@ delegate.browserMainParts.preMainMessageLoopRun = function() {
selector: 'arrangeInFront:' selector: 'arrangeInFront:'
})); }));
menu.append(new MenuItem({ type: 'submenu', submenu: appleMenu })); menu.append(new MenuItem({ submenu: appleMenu }));
menu.append(new MenuItem({ label: 'Window', type: 'submenu', submenu: windowMenu })); menu.append(new MenuItem({ label: 'Window', submenu: windowMenu }));
Menu.setApplicationMenu(menu); Menu.setApplicationMenu(menu);