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

Emit attach params as well in event

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-03 13:58:07 -08:00
parent 792f3c3030
commit 8b0d3a2567
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/api/web-contents.md
View file

@ -511,8 +511,11 @@ Returns:
* `webPreferences` Object - The web preferences that will be used by the guest * `webPreferences` Object - The web preferences that will be used by the guest
page. This object can be modified to adjust the preferences for the guest page. This object can be modified to adjust the preferences for the guest
page. page.
* `params` Object - The other `<webview>` parameters such as the `src` URL.
This object can be modified to adjust the parameters of the guest page.
Calling `event.preventDefault()` will destroy the guest page. Emitted when a `<webview>`'s web contents is being attached to this web
contents. Calling `event.preventDefault()` will destroy the guest page.
### Instance Methods ### Instance Methods

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

@ -206,7 +206,7 @@ const attachGuest = function (event, elementInstanceId, guestInstanceId, params)
webPreferences.preloadURL = params.preload webPreferences.preloadURL = params.preload
} }
event.sender.emit('will-attach-webview', event, guest, webPreferences) event.sender.emit('will-attach-webview', event, guest, webPreferences, params)
if (event.defaultPrevented) { if (event.defaultPrevented) {
if (guest.viewInstanceId == null) guest.viewInstanceId = params.instanceId if (guest.viewInstanceId == null) guest.viewInstanceId = params.instanceId
destroyGuest(embedder, guestInstanceId) destroyGuest(embedder, guestInstanceId)