Merge pull request #11968 from electron/refactor-menu-popup

Refactor menu.popup
This commit is contained in:
John Kleinschmidt 2018-02-21 14:29:52 -05:00 committed by GitHub
commit 2a97e48465
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 47 additions and 95 deletions

View file

@ -299,7 +299,12 @@ WebContents.prototype._init = function () {
this.on('pepper-context-menu', function (event, params, callback) {
// Access Menu via electron.Menu to prevent circular require.
const menu = electron.Menu.buildFromTemplate(params.menu)
menu.popup(event.sender.getOwnerBrowserWindow(), params.x, params.y, callback)
menu.popup({
window: event.sender.getOwnerBrowserWindow(),
x: params.x,
y: params.y,
callback
})
})
// The devtools requests the webContents to reload.