github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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
1 changed files with 3 additions and 3 deletions
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.
const mergeBrowserWindowOptions = function (embedder, options) {
if (options.webPreferences == null) {
options.webPreferences = {}
}
if (embedder.browserWindowOptions != null) {
// Inherit the original options if it is a BrowserWindow.
mergeOptions(options, embedder.browserWindowOptions)
} else {
// Or only inherit web-preferences if it is a webview.
if (options.webPreferences == null) {
options.webPreferences = {}
}
mergeOptions(options.webPreferences, embedder.getWebPreferences())
}