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

Use let/const instead of var

Browse source
This commit is contained in:
Kevin Sawicki 2016-11-03 10:39:40 -07:00
parent 3053be345b
commit 712b15286c
4 changed files with 85 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,6 @@ const createGuest = function (embedder, params) {
// Init guest web view after attached.
guest.on('did-attach', function () {
let opts
params = this.attachParams
delete this.attachParams
this.viewInstanceId = params.instanceId
@ -97,7 +96,7 @@ const createGuest = function (embedder, params) {
}
})
if (params.src) {
opts = {}
const opts = {}
if (params.httpreferrer) {
opts.httpReferrer = params.httpreferrer
}
@ -146,11 +145,9 @@ const createGuest = function (embedder, params) {
// Attach the guest to an element of embedder.
const attachGuest = function (embedder, elementInstanceId, guestInstanceId, params) {
let guest, guestInstance, key, oldKey, oldGuestInstanceId, ref1, webPreferences
// Destroy the old guest when attaching.
key = (embedder.getId()) + '-' + elementInstanceId
oldGuestInstanceId = embedderElementsMap[key]
const key = (embedder.getId()) + '-' + elementInstanceId
const oldGuestInstanceId = embedderElementsMap[key]
if (oldGuestInstanceId != null) {
// Reattachment to the same guest is just a no-op.
if (oldGuestInstanceId === guestInstanceId) {
@ -160,24 +157,24 @@ const attachGuest = function (embedder, elementInstanceId, guestInstanceId, para
destroyGuest(embedder, oldGuestInstanceId)
}
guestInstance = guestInstances[guestInstanceId]
const guestInstance = guestInstances[guestInstanceId]
// If this isn't a valid guest instance then do nothing.
if (!guestInstance) {
return
}
guest = guestInstance.guest
const {guest} = guestInstance
// If this guest is already attached to an element then remove it
if (guestInstance.elementInstanceId) {
oldKey = (guestInstance.embedder.getId()) + '-' + guestInstance.elementInstanceId
const oldKey = (guestInstance.embedder.getId()) + '-' + guestInstance.elementInstanceId
delete embedderElementsMap[oldKey]
webViewManager.removeGuest(guestInstance.embedder, guestInstanceId)
guestInstance.embedder.send('ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-' + guest.viewInstanceId)
}
webPreferences = {
const webPreferences = {
guestInstanceId: guestInstanceId,
nodeIntegration: (ref1 = params.nodeintegration) != null ? ref1 : false,
nodeIntegration: params.nodeintegration != null ? params.nodeintegration : false,
plugins: params.plugins,
zoomFactor: params.zoomFactor,
webSecurity: !params.disablewebsecurity,
@ -217,7 +214,7 @@ const destroyGuest = function (embedder, guestInstanceId) {
return
}
let guestInstance = guestInstances[guestInstanceId]
const guestInstance = guestInstances[guestInstanceId]
if (embedder !== guestInstance.embedder) {
return
}
@ -280,12 +277,12 @@ ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, guestIn
})
ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', function (event, guestInstanceId, params) {
const guestInstance = guestInstances[guestInstanceId]
guestInstance != null ? guestInstance.guest.setSize(params) : void 0
const guest = getGuest(guestInstanceId)
if (guest != null) guest.setSize(params)
})
// Returns WebContents from its guest id.
exports.getGuest = function (guestInstanceId) {
const getGuest = function (guestInstanceId) {
const guestInstance = guestInstances[guestInstanceId]
return guestInstance != null ? guestInstance.guest : void 0
}
@ -295,4 +292,6 @@ const getEmbedder = function (guestInstanceId) {
const guestInstance = guestInstances[guestInstanceId]
return guestInstance != null ? guestInstance.embedder : void 0
}
exports.getGuest = getGuest
exports.getEmbedder = getEmbedder