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

Merge pull request #8974 from electron/default-popup-async-value

Browse Source 
Default async to false when object is specified
This commit is contained in:
Kevin Sawicki
2017-03-21 06:36:29 -07:00
committed by GitHub
parent 253caf35ab 23b235c9c7
commit f7e3f9035d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/browser/api/menu.js
View File

@@ -144,7 +144,7 @@ Menu.prototype._init = function () {
}
Menu.prototype.popup = function (window, x, y, positioningItem) {
let asyncPopup = false
let asyncPopup
// menu.popup(x, y, positioningItem)
if (window != null && (typeof window !== 'object' || window.constructor !== BrowserWindow)) {
@@ -174,6 +174,9 @@ Menu.prototype.popup = function (window, x, y, positioningItem) {
// Default to not highlighting any item.
if (typeof positioningItem !== 'number') positioningItem = -1
// Default to synchronous for backwards compatibility.
if (typeof asyncPopup !== 'boolean') asyncPopup = false
this.popupAt(window, x, y, positioningItem, asyncPopup)
}