github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-28 08:48:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
1 changed files with 3 additions and 2 deletions
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
}
// menu.popup({})
if (window != null && window.constructor === Object) {
// menu.popup({}) || menu.popup(window, callback)
if ((window != null && window.constructor === Object) ||
(x && typeof x === 'function')) {
opts = window
callback = arguments[1]
// menu.popup(window, {})