зеркало из https://github.com/electron/electron.git
fix: inheritance of webPreferences sub properties
This commit is contained in:
Родитель
5a72441b2a
Коммит
7a514d26bb
|
@ -27,11 +27,11 @@ const mergeOptions = function (child, parent, visited) {
|
|||
for (const key in parent) {
|
||||
if (key === 'isBrowserView') continue
|
||||
if (!hasProp.call(parent, key)) continue
|
||||
if (key in child) continue
|
||||
if (key in child && key !== 'webPreferences') continue
|
||||
|
||||
const value = parent[key]
|
||||
if (typeof value === 'object') {
|
||||
child[key] = mergeOptions({}, value, visited)
|
||||
child[key] = mergeOptions(child[key] || {}, value, visited)
|
||||
} else {
|
||||
child[key] = value
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче