mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Update electron to 22.0.0

Browse source
This commit is contained in:
Fedor Indutny 2022-12-15 13:31:43 -08:00 • committed by GitHub
parent 2a4166a836
commit 47b0ee6135
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 54 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/main.ts
View file

@ -447,8 +447,7 @@ async function prepareUrl(
return setUrlSearchParams(url, { config: JSON.stringify(parsed.data) }).href;
}
async function handleUrl(event: Electron.Event, rawTarget: string) {
event.preventDefault();
async function handleUrl(rawTarget: string) {
const parsedUrl = maybeParseUrl(rawTarget);
if (!parsedUrl) {
return;
@ -481,8 +480,15 @@ function handleCommonWindowEvents(
window: BrowserWindow,
titleBarOverlay: TitleBarOverlayOptions | false = false
) {
window.webContents.on('will-navigate', handleUrl);
window.webContents.on('new-window', handleUrl);
window.webContents.on('will-navigate', (event, rawTarget) => {
event.preventDefault();
handleUrl(rawTarget);
});
window.webContents.setWindowOpenHandler(({ url }) => {
handleUrl(url);
return { action: 'deny' };
});
window.webContents.on(
'preload-error',
(_event: Electron.Event, preloadPath: string, error: Error) => {
@ -2001,9 +2007,7 @@ app.on(
contents.on('will-attach-webview', attachEvent => {
attachEvent.preventDefault();
});
contents.on('new-window', newEvent => {
newEvent.preventDefault();
});
contents.setWindowOpenHandler(() => ({ action: 'deny' }));
}
);