mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-04-21 04:41:08 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fix external URLs in popup windows are not handled correctly (#69)

Browse source
This commit is contained in:
Quang Lam 2019-12-07 21:33:21 -06:00 • committed by GitHub
parent bd6860a220
commit 7228bc71df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
public/libs/views.js
View file

@ -1,5 +1,6 @@
const {
BrowserView,
BrowserWindow,
app,
session,
shell,
@ -107,7 +108,7 @@ const addView = (browserWindow, workspace) => {
}
});
view.webContents.on('new-window', (e, nextUrl, frameName, disposition, options) => {
const handleNewWindow = (e, nextUrl, frameName, disposition, options) => {
const appDomain = extractDomain(getWorkspace(workspace.id).homeUrl);
const nextDomain = extractDomain(nextUrl);
@ -117,9 +118,18 @@ const addView = (browserWindow, workspace) => {
|| disposition === 'new-window'
) {
// https://gist.github.com/Gvozd/2cec0c8c510a707854e439fb15c561b0
/*
Object.assign(options, {
parent: browserWindow,
});
*/
e.preventDefault();
Object.assign(options, {
parent: browserWindow,
});
const popupWin = new BrowserWindow(options);
popupWin.webContents.on('new-window', handleNewWindow);
e.newGuest = popupWin;
return;
}
@ -131,7 +141,7 @@ const addView = (browserWindow, workspace) => {
|| nextDomain === appDomain
) {
e.preventDefault();
view.webContents.loadURL(nextUrl);
e.sender.loadURL(nextUrl);
return;
}
@ -140,7 +150,8 @@ const addView = (browserWindow, workspace) => {
e.preventDefault();
shell.openExternal(nextUrl);
}
});
};
view.webContents.on('new-window', handleNewWindow);
// Handle downloads
// https://electronjs.org/docs/api/download-item