mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
refactor: remove menu-will-close / setTimeout workaround (#18582)
This commit is contained in:
committed by
Charles Kerr
parent
3c8acf3687
commit
cf628d9287
@@ -69,14 +69,7 @@ ipcMainUtils.handle('ELECTRON_INSPECTOR_CONTEXT_MENU', function (event, items, i
|
||||
const menu = Menu.buildFromTemplate(template)
|
||||
const window = event.sender.getOwnerBrowserWindow()
|
||||
|
||||
menu.once('menu-will-close', () => {
|
||||
// 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 })
|
||||
menu.popup({ window, callback: () => resolve() })
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user