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

Do not return TopLevelWindow in BrowserWindow.getAllWindows

Browse source
This commit is contained in:
Cheng Zhao 2018-04-17 16:53:55 +09:00
parent e38f511737
commit 1340b17424
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/api/atom_api_browser_window.cc
View file

@ -438,14 +438,8 @@ void Initialize(v8::Local<v8::Object> exports,
templ->InstanceTemplate()->SetInternalFieldCount(1); templ->InstanceTemplate()->SetInternalFieldCount(1);
BrowserWindow::BuildPrototype(isolate, templ); BrowserWindow::BuildPrototype(isolate, templ);
mate::Dictionary browser_window(isolate, templ->GetFunction());
browser_window.SetMethod(
"fromId", &mate::TrackableObject<TopLevelWindow>::FromWeakMapID);
browser_window.SetMethod("getAllWindows",
&mate::TrackableObject<TopLevelWindow>::GetAll);
mate::Dictionary dict(isolate, exports); mate::Dictionary dict(isolate, exports);
dict.Set("BrowserWindow", browser_window); dict.Set("BrowserWindow", templ->GetFunction());
} }
} // namespace } // namespace

13
lib/browser/api/browser-window.js
View file

@ -128,6 +128,19 @@ BrowserWindow.prototype._init = function () {
}) })
} }
const isBrowserWindow = (win) => {
return win && win.constructor.name === 'BrowserWindow'
}
BrowserWindow.fromId = (id) => {
const win = TopLevelWindow.fromId(id)
return isBrowserWindow(win) ? win : null
}
BrowserWindow.getAllWindows = () => {
return TopLevelWindow.getAllWindows().filter(isBrowserWindow)
}
BrowserWindow.getFocusedWindow = () => { BrowserWindow.getFocusedWindow = () => {
for (let window of BrowserWindow.getAllWindows()) { for (let window of BrowserWindow.getAllWindows()) {
if (window.isFocused() || window.isDevToolsFocused()) return window if (window.isFocused() || window.isDevToolsFocused()) return window