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

Fix error when showing empty menu.

Browse source
This commit is contained in:
Cheng Zhao 2014-05-25 16:37:45 +08:00
parent f07d8c5677
commit 22927c9478
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,7 +99,7 @@ Menu.setApplicationMenu = (menu) ->
if process.platform is 'darwin' if process.platform is 'darwin'
# Force menuWillShow to be called # Force menuWillShow to be called
menuWillShow = (menu) -> menuWillShow = (menu) ->
menu.delegate.menuWillShow() menu.delegate?.menuWillShow()
menuWillShow item.submenu for item in menu.items when item.submenu? menuWillShow item.submenu for item in menu.items when item.submenu?
menuWillShow menu menuWillShow menu

4
spec/static/main.js
View file

@ -127,10 +127,6 @@ app.on('ready', function() {
}, },
] ]
}, },
{
label: 'Help',
submenu: [],
}
]; ];
var menu = Menu.buildFromTemplate(template); var menu = Menu.buildFromTemplate(template);