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

refactor: return options directly in makeBrowserWindowOptions() helper (#34309)

Browse source
This commit is contained in:
Milan Burda 2022-05-24 10:23:16 +02:00 • committed by GitHub
parent ba573f5583
commit 9d3fc9c794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/browser/guest-window-manager.ts
View file

@ -41,7 +41,7 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
outlivesOpener: boolean, outlivesOpener: boolean,
}): BrowserWindow | undefined { }): BrowserWindow | undefined {
const { url, frameName, features } = windowOpenArgs; const { url, frameName, features } = windowOpenArgs;
const { options: browserWindowOptions } = makeBrowserWindowOptions({ const browserWindowOptions = makeBrowserWindowOptions({
embedder, embedder,
features, features,
overrideOptions: overrideBrowserWindowOptions overrideOptions: overrideBrowserWindowOptions
@ -211,7 +211,6 @@ function makeBrowserWindowOptions ({ embedder, features, overrideOptions }: {
const { options: parsedOptions, webPreferences: parsedWebPreferences } = parseFeatures(features); const { options: parsedOptions, webPreferences: parsedWebPreferences } = parseFeatures(features);
return { return {
options: {
show: true, show: true,
width: 800, width: 800,
height: 600, height: 600,
@ -226,8 +225,7 @@ function makeBrowserWindowOptions ({ embedder, features, overrideOptions }: {
insecureParsedWebPreferences: parsedWebPreferences, insecureParsedWebPreferences: parsedWebPreferences,
secureOverrideWebPreferences: overrideOptions && overrideOptions.webPreferences secureOverrideWebPreferences: overrideOptions && overrideOptions.webPreferences
}) })
} as Electron.BrowserViewConstructorOptions } as Electron.BrowserViewConstructorOptions;
};
} }
export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {}, insecureParsedWebPreferences: parsedWebPreferences = {} }: { export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {}, insecureParsedWebPreferences: parsedWebPreferences = {} }: {