mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-02-26 01:51:43 -08:00
Code Issues Projects Releases Packages Wiki Activity

Force non-popup external links to open in default browser (#259)

Browse source
This commit is contained in:
Quang Lam 2020-05-16 11:50:43 +07:00 • committed by GitHub
parent 8728f4edf3
commit 34e1f8cc16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
public/libs/views.js
View file

@ -65,6 +65,14 @@ const equivalentDomain = (domain) => {
};
const isInternalUrl = (url, currentInternalUrls) => {
// google have a lot of redirections after logging in
// so assume any requests made after 'accounts.google.com' are internals
for (let i = 0; i < currentInternalUrls.length; i += 1) {
if (currentInternalUrls[i].startsWith('https://accounts.google.com')) {
return true;
}
}
// external links sent in Google Meet meeting goes through this link first
// https://meet.google.com/linkredirect?authuser=1&dest=https://something.com
if (url.startsWith('https://meet.google.com/linkredirect')) {
@ -193,8 +201,17 @@ const addView = (browserWindow, workspace) => {
};
}
view.webContents.on('will-navigate', (e, url) => {
adjustUserAgentByUrl(e.sender.webContents, url);
view.webContents.on('will-navigate', (e, nextUrl) => {
// open external links in browser
// https://github.com/atomery/webcatalog/issues/849#issuecomment-629587264
const appUrl = getWorkspace(workspace.id).homeUrl;
const currentUrl = e.sender.getURL();
if (!isInternalUrl(nextUrl, [appUrl, currentUrl])) {
e.preventDefault();
shell.openExternal(nextUrl);
}
adjustUserAgentByUrl(e.sender.webContents, nextUrl);
});
view.webContents.on('did-start-loading', () => {