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

refactor: remove menu-will-close / setTimeout workaround (#18582)

Browse source
This commit is contained in:
Milan Burda 2019-06-03 23:48:01 +02:00 committed by Charles Kerr
parent 3c8acf3687
commit cf628d9287
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/browser/devtools.js
View file

@ -69,14 +69,7 @@ ipcMainUtils.handle('ELECTRON_INSPECTOR_CONTEXT_MENU', function (event, items, i
const menu = Menu.buildFromTemplate(template) const menu = Menu.buildFromTemplate(template)
const window = event.sender.getOwnerBrowserWindow() const window = event.sender.getOwnerBrowserWindow()
menu.once('menu-will-close', () => { menu.popup({ window, callback: () => resolve() })
// menu-will-close is emitted before the click handler, but needs to be sent after.
// otherwise, DevToolsAPI.contextMenuCleared() would be called before
// DevToolsAPI.contextMenuItemSelected(id) and the menu will not work properly.
setTimeout(() => resolve())
})
menu.popup({ window })
}) })
}) })