mirror of
https://github.com/electron/electron.git
synced 2026-01-25 15:28:11 -05:00
🎨
This commit is contained in:
@@ -118,7 +118,6 @@ Menu.prototype._init = function () {
|
||||
executeCommand: (event, commandId) => {
|
||||
const command = this.commandsMap[commandId]
|
||||
if (command == null) return
|
||||
|
||||
command.click(event, BrowserWindow.getFocusedWindow(), webContents.getFocusedWebContents())
|
||||
},
|
||||
menuWillShow: () => {
|
||||
|
||||
@@ -251,12 +251,10 @@ module.exports = {
|
||||
let focused = null
|
||||
for (let contents of getAllWebContents()) {
|
||||
if (!contents.isFocused()) continue
|
||||
|
||||
if (focused == null) focused = contents
|
||||
// Return webview web contents which may be embedded inside another
|
||||
// web contents that is also reporting as focused
|
||||
if (contents.getType() === 'webview') return contents
|
||||
|
||||
if (focused == null) focused = contents
|
||||
}
|
||||
return focused
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user