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

web-preferences -> webPreferences

Browse source
This commit is contained in:
Kevin Sawicki 2017-05-24 11:30:59 -07:00
parent f5cf6d4ddd
commit e735aa7dee
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ const mergeBrowserWindowOptions = function (embedder, options) {
// 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 webPreferences if it is a webview.
mergeOptions(options.webPreferences, embedder.getWebPreferences()) mergeOptions(options.webPreferences, embedder.getWebPreferences())
} }

2
spec/api-browser-window-spec.js
View file

@ -854,7 +854,7 @@ describe('BrowserWindow module', function () {
}) })
}) })
describe('"web-preferences" option', function () { describe('"webPreferences" option', function () {
afterEach(function () { afterEach(function () {
ipcMain.removeAllListeners('answer') ipcMain.removeAllListeners('answer')
}) })