🎨

kevinsawicki · kevinsawicki · commit 72cdba2b8ea0 · 2016-07-13T14:49:25.000-07:00
diff --git a/lib/browser/api/menu.js b/lib/browser/api/menu.js
@@ -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: () => {
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
@@ -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
   }

Original file line number	Diff line number	Diff line change
`@@ -251,12 +251,10 @@ module.exports = {`
`251`	`251`	`let focused = null`
`252`	`252`	`for (let contents of getAllWebContents()) {`
`253`	`253`	`if (!contents.isFocused()) continue`
`254`		`-`
	`254`	`+ if (focused == null) focused = contents`
`255`	`255`	`// Return webview web contents which may be embedded inside another`
`256`	`256`	`// web contents that is also reporting as focused`
`257`	`257`	`if (contents.getType() === 'webview') return contents`
`258`		`-`
`259`		`- if (focused == null) focused = contents`
`260`	`258`	`}`
`261`	`259`	`return focused`
`262`	`260`	`}`