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

Revert "fix: Fix menu.popup() bugs"

Browse source
This commit is contained in:
Alexey Kuzmin 2017-12-12 13:59:34 +03:00 committed by GitHub
parent 19f1fef040
commit 1c8eb03574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,49 +45,30 @@ Menu.prototype._init = function () {
Menu.prototype.popup = function (window, x, y, positioningItem) { Menu.prototype.popup = function (window, x, y, positioningItem) {
let [newX, newY, newPosition, newWindow] = [x, y, positioningItem, window] let [newX, newY, newPosition, newWindow] = [x, y, positioningItem, window]
let opts
// menu.popup(x, y, positioningItem) // menu.popup(x, y, positioningItem)
if (window != null && !(window instanceof BrowserWindow)) { if (!window) {
// shift over values
if (typeof window !== 'object' || window.constructor !== BrowserWindow) {
[newPosition, newY, newX, newWindow] = [y, x, window, null] [newPosition, newY, newX, newWindow] = [y, x, window, null]
} }
// menu.popup({})
if (window != null && window.constructor === Object) {
opts = window
// menu.popup(window, {})
} else if (x && typeof x === 'object') {
opts = x
} }
if (opts) { // menu.popup(window, {})
if (x && typeof x === 'object') {
const opts = x
newX = opts.x newX = opts.x
newY = opts.y newY = opts.y
newPosition = opts.positioningItem newPosition = opts.positioningItem
} }
// set defaults // set defaults
if (typeof newX !== 'number') newX = -1 if (typeof x !== 'number') newX = -1
if (typeof newY !== 'number') newY = -1 if (typeof y !== 'number') newY = -1
if (typeof newPosition !== 'number') newPosition = -1 if (typeof positioningItem !== 'number') newPosition = -1
if (!newWindow || (newWindow && newWindow.constructor !== BrowserWindow)) { if (!window) newWindow = BrowserWindow.getFocusedWindow()
newWindow = BrowserWindow.getFocusedWindow()
// No window focused?
if (!newWindow) {
const browserWindows = BrowserWindow.getAllWindows()
if (browserWindows && browserWindows.length > 0) {
newWindow = browserWindows[0]
} else {
throw new Error(`Cannot open Menu without a BrowserWindow present`)
}
}
}
this.popupAt(newWindow, newX, newY, newPosition) this.popupAt(newWindow, newX, newY, newPosition)
return { browserWindow: newWindow, x: newX, y: newY, position: newPosition }
} }
Menu.prototype.closePopup = function (window) { Menu.prototype.closePopup = function (window) {

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

@ -283,52 +283,7 @@ describe('Menu module', () => {
}) })
it('returns immediately', () => { it('returns immediately', () => {
const { browserWindow, x, y } = menu.popup(w, {x: 100, y: 101}) menu.popup(w, {x: 100, y: 100, async: true})
assert.equal(browserWindow, w)
assert.equal(x, 100)
assert.equal(y, 101)
menu.closePopup(w)
})
it('works without a given BrowserWindow and options', () => {
const { browserWindow, x, y } = menu.popup({x: 100, y: 101})
assert.equal(browserWindow.constructor.name, 'BrowserWindow')
assert.equal(x, 100)
assert.equal(y, 101)
menu.closePopup()
})
it('works without a given BrowserWindow', () => {
const { browserWindow, x, y } = menu.popup(100, 101)
assert.equal(browserWindow.constructor.name, 'BrowserWindow')
assert.equal(x, 100)
assert.equal(y, 101)
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)
assert.equal(browserWindow, w)
assert.equal(x, 100)
assert.equal(y, 101)
menu.closePopup(w) menu.closePopup(w)
}) })
}) })