github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4057 from princejwesley/browser-window

Browse Source 
Return null for no focused window when calling BrowserWindow.getFocusedWindow
This commit is contained in:
Cheng Zhao
2016-01-11 22:53:38 +08:00
parent 192fa4c86b 018ae5189b
commit 9e82334b67
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
atom/browser/api/lib/browser-window.coffee
View File

@@ -66,6 +66,7 @@ BrowserWindow::_init = ->
BrowserWindow.getFocusedWindow = ->
windows = BrowserWindow.getAllWindows()
return window for window in windows when window.isFocused()
null
BrowserWindow.fromWebContents = (webContents) ->
windows = BrowserWindow.getAllWindows()

2
docs/api/browser-window.md
View File

@@ -289,7 +289,7 @@ Returns an array of all opened browser windows.
### `BrowserWindow.getFocusedWindow()`
Returns the window that is focused in this application.
Returns the window that is focused in this application, otherwise returns `null`.
### `BrowserWindow.fromWebContents(webContents)`