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

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

36
lib/renderer/web-view/guest-view-internal.js
View file

@ -1,11 +1,10 @@
'use strict'
const ipcRenderer = require('electron').ipcRenderer
const webFrame = require('electron').webFrame
const {ipcRenderer, webFrame} = require('electron')
var requestId = 0
let requestId = 0
var WEB_VIEW_EVENTS = {
const WEB_VIEW_EVENTS = {
'load-commit': ['url', 'isMainFrame'],
'did-attach': [],
'did-finish-load': [],
@ -40,19 +39,19 @@ var WEB_VIEW_EVENTS = {
'update-target-url': ['url']
}
var DEPRECATED_EVENTS = {
const DEPRECATED_EVENTS = {
'page-title-updated': 'page-title-set'
}
var dispatchEvent = function (webView, eventName, eventKey, ...args) {
var domEvent, f, i, j, len, ref1
const dispatchEvent = function (webView, eventName, eventKey, ...args) {
let f, i, j, len
if (DEPRECATED_EVENTS[eventName] != null) {
dispatchEvent.apply(null, [webView, DEPRECATED_EVENTS[eventName], eventKey].concat(args))
}
domEvent = new Event(eventName)
ref1 = WEB_VIEW_EVENTS[eventKey]
for (i = j = 0, len = ref1.length; j < len; i = ++j) {
f = ref1[i]
const domEvent = new Event(eventName)
const props = WEB_VIEW_EVENTS[eventKey]
for (i = j = 0, len = props.length; j < len; i = ++j) {
f = props[i]
domEvent[f] = args[i]
}
webView.dispatchEvent(domEvent)
@ -64,11 +63,10 @@ var dispatchEvent = function (webView, eventName, eventKey, ...args) {
module.exports = {
registerEvents: function (webView, viewInstanceId) {
ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-' + viewInstanceId, function () {
var domEvent
webFrame.detachGuest(webView.internalInstanceId)
webView.guestInstanceId = undefined
webView.reset()
domEvent = new Event('destroyed')
const domEvent = new Event('destroyed')
webView.dispatchEvent(domEvent)
})
@ -77,18 +75,18 @@ module.exports = {
})
ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + viewInstanceId, function (event, channel, ...args) {
var domEvent = new Event('ipc-message')
const domEvent = new Event('ipc-message')
domEvent.channel = channel
domEvent.args = args
webView.dispatchEvent(domEvent)
})
ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + viewInstanceId, function (event, ...args) {
var domEvent, f, i, j, len, ref1
domEvent = new Event('size-changed')
ref1 = ['oldWidth', 'oldHeight', 'newWidth', 'newHeight']
for (i = j = 0, len = ref1.length; j < len; i = ++j) {
f = ref1[i]
let f, i, j, len
const domEvent = new Event('size-changed')
const props = ['oldWidth', 'oldHeight', 'newWidth', 'newHeight']
for (i = j = 0, len = props.length; j < len; i = ++j) {
f = props[i]
domEvent[f] = args[i]
}
webView.onSizeChanged(domEvent)