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

More let/const-ing

Browse source
This commit is contained in:
Kevin Sawicki 2016-06-07 10:29:24 -07:00
parent 5c880b7c99
commit ba762464d2
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,9 +4,9 @@ const ipcMain = require('electron').ipcMain
const webContents = require('electron').webContents const webContents = require('electron').webContents
// Doesn't exist in early initialization. // Doesn't exist in early initialization.
var webViewManager = null let webViewManager = null
var supportedWebViewEvents = [ const supportedWebViewEvents = [
'load-commit', 'load-commit',
'did-finish-load', 'did-finish-load',
'did-fail-load', 'did-fail-load',
@ -40,23 +40,23 @@ var supportedWebViewEvents = [
'update-target-url' 'update-target-url'
] ]
var nextInstanceId = 0 let nextInstanceId = 0
var guestInstances = {} const guestInstances = {}
var embedderElementsMap = {} const embedderElementsMap = {}
var reverseEmbedderElementsMap = {} const reverseEmbedderElementsMap = {}
// Moves the last element of array to the first one. // Moves the last element of array to the first one.
var moveLastToFirst = function (list) { const moveLastToFirst = function (list) {
return list.unshift(list.pop()) return list.unshift(list.pop())
} }
// Generate guestInstanceId. // Generate guestInstanceId.
var getNextInstanceId = function () { const getNextInstanceId = function () {
return ++nextInstanceId return ++nextInstanceId
} }
// Create a new guest instance. // Create a new guest instance.
var createGuest = function (embedder, params) { const createGuest = function (embedder, params) {
if (webViewManager == null) { if (webViewManager == null) {
webViewManager = process.atomBinding('web_view_manager') webViewManager = process.atomBinding('web_view_manager')
} }
@ -98,7 +98,7 @@ var createGuest = function (embedder, params) {
// Init guest web view after attached. // Init guest web view after attached.
guest.once('did-attach', function () { guest.once('did-attach', function () {
var opts let opts
params = this.attachParams params = this.attachParams
delete this.attachParams delete this.attachParams
this.viewInstanceId = params.instanceId this.viewInstanceId = params.instanceId
@ -154,8 +154,8 @@ var createGuest = function (embedder, params) {
} }
// Attach the guest to an element of embedder. // Attach the guest to an element of embedder.
var attachGuest = function (embedder, elementInstanceId, guestInstanceId, params) { const attachGuest = function (embedder, elementInstanceId, guestInstanceId, params) {
var guest, key, oldGuestInstanceId, ref1, webPreferences let guest, key, oldGuestInstanceId, ref1, webPreferences
guest = guestInstances[guestInstanceId].guest guest = guestInstances[guestInstanceId].guest
// Destroy the old guest when attaching. // Destroy the old guest when attaching.
@ -190,12 +190,12 @@ var attachGuest = function (embedder, elementInstanceId, guestInstanceId, params
} }
// Destroy an existing guest instance. // Destroy an existing guest instance.
var destroyGuest = function (embedder, id) { const destroyGuest = function (embedder, id) {
var key
webViewManager.removeGuest(embedder, id) webViewManager.removeGuest(embedder, id)
guestInstances[id].guest.destroy() guestInstances[id].guest.destroy()
delete guestInstances[id] delete guestInstances[id]
key = reverseEmbedderElementsMap[id]
const key = reverseEmbedderElementsMap[id]
if (key != null) { if (key != null) {
delete reverseEmbedderElementsMap[id] delete reverseEmbedderElementsMap[id]
return delete embedderElementsMap[key] return delete embedderElementsMap[key]
@ -215,18 +215,18 @@ ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, id) {
}) })
ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', function (event, id, params) { ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', function (event, id, params) {
var ref1 const guestInstance = guestInstances[id]
return (ref1 = guestInstances[id]) != null ? ref1.guest.setSize(params) : void 0 return guestInstance != null ? guestInstance.guest.setSize(params) : void 0
}) })
// Returns WebContents from its guest id. // Returns WebContents from its guest id.
exports.getGuest = function (id) { exports.getGuest = function (id) {
var ref1 const guestInstance = guestInstances[id]
return (ref1 = guestInstances[id]) != null ? ref1.guest : void 0 return guestInstance != null ? guestInstance.guest : void 0
} }
// Returns the embedder of the guest. // Returns the embedder of the guest.
exports.getEmbedder = function (id) { exports.getEmbedder = function (id) {
var ref1 const guestInstance = guestInstances[id]
return (ref1 = guestInstances[id]) != null ? ref1.embedder : void 0 return guestInstance != null ? guestInstance.embedder : void 0
} }