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

Merge pull request #11961 from electron/fix-bw-callback

Browse source 
add conditional for menu.popup(window, callback)
This commit is contained in:
shelley vohr 2018-02-19 19:54:20 -05:00 committed by GitHub
commit 459a5e3a1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 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, {})

5
spec/api-menu-spec.js
View file

@ -383,6 +383,11 @@ describe('Menu module', () => {
assert.equal(y, 101) assert.equal(y, 101)
}) })
it('works with a given BrowserWindow, no options, and a callback', (done) => {
menu.popup(w, () => done())
menu.closePopup()
})
it('calls the callback', (done) => { it('calls the callback', (done) => {
menu.popup({}, () => done()) menu.popup({}, () => done())
menu.closePopup() menu.closePopup()