octoleo/nativefier
2
2
Fork 0
mirror of https://github.com/Llewellynvdm/nativefier.git synced 2025-01-22 22:58:33 +00:00
Code Issues Releases Activity

Only try to inject CSS for valid web requests (fix #939: crash on tab close, PR #1181)

Browse Source
This commit is contained in:
Adam Weeden 2021-05-08 10:12:10 -04:00 committed by GitHub
parent 067327e863
commit 5fbf14d35d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/components/mainWindow.ts
View File

@ -7,6 +7,8 @@ import {
ipcMain,
dialog,
Event,
HeadersReceivedResponse,
OnHeadersReceivedListenerDetails,
WebContents,
} from 'electron';
import windowStateKeeper from 'electron-window-state';
@ -72,9 +74,18 @@ function injectCss(browserWindow: BrowserWindow): void {
// Will run multiple times, see `did-finish-load` below that unsets this handler.
browserWindow.webContents.session.webRequest.onHeadersReceived(
{ urls: [] }, // Pass an empty filter list; null will not match _any_ urls
(details, callback) => {
(
details: OnHeadersReceivedListenerDetails,
callback: (headersReceivedResponse: HeadersReceivedResponse) => void,
) => {
log.debug(
'browserWindow.webContents.session.webRequest.onHeadersReceived',
{ details, callback },
);
if (details.webContents) {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
browserWindow.webContents.insertCSS(cssToInject);
details.webContents.insertCSS(cssToInject);
}
callback({ cancel: false, responseHeaders: details.responseHeaders });
},
);
@ -349,7 +360,13 @@ export function createMainWindow(
event: Event & { newGuest?: any },
urlToGo: string,
frameName: string,
disposition,
disposition:
| 'default'
| 'foreground-tab'
| 'background-tab'
| 'new-window'
| 'save-to-disk'
| 'other',
): void => {
log.debug('onNewWindow', { event, urlToGo, frameName, disposition });
const preventDefault = (newGuest: any): void => {