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

Allow settting menu to null

Browse source
This commit is contained in:
Cheng Zhao 2015-06-04 15:14:43 +08:00
parent cc3066e746
commit 6d6e75795f
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/lib/browser-window.coffee
View file

@ -73,7 +73,7 @@ BrowserWindow::setMenu = (menu) ->
if process.platform is 'darwin' if process.platform is 'darwin'
throw new Error('BrowserWindow.setMenu is not available on OS X') throw new Error('BrowserWindow.setMenu is not available on OS X')
throw new TypeError('Invalid menu') unless menu?.constructor?.name is 'Menu' throw new TypeError('Invalid menu') unless menu is null or menu?.constructor?.name is 'Menu'
@menu = menu # Keep a reference of menu in case of GC. @menu = menu # Keep a reference of menu in case of GC.
@menu.attachToWindow this @menu.attachToWindow this

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

@ -130,11 +130,12 @@ Menu::_callMenuWillShow = ->
applicationMenu = null applicationMenu = null
Menu.setApplicationMenu = (menu) -> Menu.setApplicationMenu = (menu) ->
throw new TypeError('Invalid menu') unless menu?.constructor is Menu throw new TypeError('Invalid menu') unless menu is null or menu.constructor is Menu
applicationMenu = menu # Keep a reference. applicationMenu = menu # Keep a reference.
if process.platform is 'darwin' if process.platform is 'darwin'
menu._callMenuWillShow() menu._callMenuWillShow()
throw new Error('You can not remove application menu') if menu is null
bindings.setApplicationMenu menu bindings.setApplicationMenu menu
else else
windows = BrowserWindow.getAllWindows() windows = BrowserWindow.getAllWindows()