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

Default webPreferences to empty object always

Browse source
This commit is contained in:
Samuel Attard 2016-10-07 11:45:13 +11:00
parent 4d7050553c
commit 09e5035ab5
No known key found for this signature in database
GPG key ID: 273DC1869D8F13EF
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,14 +24,14 @@ const mergeOptions = function (child, parent) {
// Merge |options| with the |embedder|'s window's options. // Merge |options| with the |embedder|'s window's options.
const mergeBrowserWindowOptions = function (embedder, options) { const mergeBrowserWindowOptions = function (embedder, options) {
if (options.webPreferences == null) {
options.webPreferences = {}
}
if (embedder.browserWindowOptions != null) { if (embedder.browserWindowOptions != null) {
// Inherit the original options if it is a BrowserWindow. // Inherit the original options if it is a BrowserWindow.
mergeOptions(options, embedder.browserWindowOptions) mergeOptions(options, embedder.browserWindowOptions)
} else { } else {
// Or only inherit web-preferences if it is a webview. // Or only inherit web-preferences if it is a webview.
if (options.webPreferences == null) {
options.webPreferences = {}
}
mergeOptions(options.webPreferences, embedder.getWebPreferences()) mergeOptions(options.webPreferences, embedder.getWebPreferences())
} }