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

🔧 Feedback

Browse Source
This commit is contained in:
Felix Rieseberg
2017-12-11 14:43:35 -08:00
parent 76df41b5d0
commit c4ec8b4545
2 changed files with 12 additions and 2 deletions
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
// 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]
}
// menu.popup({})
if (typeof window === 'object' && window.constructor !== BrowserWindow) {
if (window && window.constructor !== BrowserWindow) {
opts = window
// menu.popup(window, {})
} else if (x && typeof x === 'object') {

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

@@ -312,6 +312,16 @@ describe('Menu module', () => {
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', () => {
const { browserWindow, x, y } = menu.popup(w, 100, 101)