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

Only forward events when nativeWindowOpen is set

Browse source
This commit is contained in:
Kevin Sawicki 2017-05-23 13:54:27 -07:00
parent a2a7a1d8c7
commit 47759a01de
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,20 +116,6 @@ const createGuest = function (embedder, params) {
guest.allowPopups = params.allowpopups guest.allowPopups = params.allowpopups
}) })
guest.on('-add-new-contents', (...args) => {
const embedder = getEmbedder(guestInstanceId)
if (embedder != null) {
embedder.emit('-add-new-contents', ...args)
}
})
guest.on('-web-contents-created', (...args) => {
const embedder = getEmbedder(guestInstanceId)
if (embedder != null) {
embedder.emit('-web-contents-created', ...args)
}
})
const sendToEmbedder = (channel, ...args) => { const sendToEmbedder = (channel, ...args) => {
const embedder = getEmbedder(guestInstanceId) const embedder = getEmbedder(guestInstanceId)
if (embedder != null) { if (embedder != null) {
@ -157,6 +143,25 @@ const createGuest = function (embedder, params) {
sendToEmbedder('ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED', ...args) sendToEmbedder('ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED', ...args)
}) })
// Forward internal web contents event to embedder to handle
// native window.open setup
guest.on('-add-new-contents', (...args) => {
if (guest.getWebPreferences().nativeWindowOpen === true) {
const embedder = getEmbedder(guestInstanceId)
if (embedder != null) {
embedder.emit('-add-new-contents', ...args)
}
}
})
guest.on('-web-contents-created', (...args) => {
if (guest.getWebPreferences().nativeWindowOpen === true) {
const embedder = getEmbedder(guestInstanceId)
if (embedder != null) {
embedder.emit('-web-contents-created', ...args)
}
}
})
return guestInstanceId return guestInstanceId
} }