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

🔧 Feedback

Browse source
This commit is contained in:
Felix Rieseberg 2017-12-11 14:43:35 -08:00
parent f7ebfff8ae
commit 89b90be6a2
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,12 +48,12 @@ Menu.prototype.popup = function (window, x, y, positioningItem) {
let opts let opts
// menu.popup(x, y, positioningItem) // menu.popup(x, y, positioningItem)
if (window && typeof window !== 'object' || window.constructor !== BrowserWindow) { if (window != null && !(window instanceof BrowserWindow)) {
[newPosition, newY, newX, newWindow] = [y, x, window, null] [newPosition, newY, newX, newWindow] = [y, x, window, null]
} }
// menu.popup({}) // menu.popup({})
if (typeof window === 'object' && window.constructor !== BrowserWindow) { if (window && window.constructor !== BrowserWindow) {
opts = window opts = window
// menu.popup(window, {}) // menu.popup(window, {})
} else if (x && typeof x === 'object') { } else if (x && typeof x === 'object') {

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

@ -312,6 +312,16 @@ describe('Menu module', () => {
menu.closePopup() menu.closePopup()
}) })
it('works without a given BrowserWindow and 0 options', () => {
const { browserWindow, x, y } = menu.popup(0, 1)
assert.equal(browserWindow.constructor.name, 'BrowserWindow')
assert.equal(x, 0)
assert.equal(y, 1)
menu.closePopup()
})
it('works with a given BrowserWindow and no options', () => { it('works with a given BrowserWindow and no options', () => {
const { browserWindow, x, y } = menu.popup(w, 100, 101) const { browserWindow, x, y } = menu.popup(w, 100, 101)