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

add conditional for menu.popup(window, callback)

Browse source
This commit is contained in:
Shelley Vohr 2018-02-19 13:06:37 -05:00
parent 55d4d74624
commit cd9e7142e4
No known key found for this signature in database
GPG key ID: F13993A75599653C
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/browser/api/menu.js
View file

@ -58,8 +58,9 @@ Menu.prototype.popup = function (window, x, y, positioningItem) {
callback = newPosition callback = newPosition
} }
// menu.popup({}) // menu.popup({}) || menu.popup(window, callback)
if (window != null && window.constructor === Object) { if ((window != null && window.constructor === Object) ||
(x && typeof x === 'function')) {
opts = window opts = window
callback = arguments[1] callback = arguments[1]
// menu.popup(window, {}) // menu.popup(window, {})