standardize by hand
This commit is contained in:
parent
cfdfdc8ccc
commit
e6698102c9
13 changed files with 34 additions and 33 deletions
|
@ -6,7 +6,7 @@ const EventEmitter = require('events').EventEmitter
|
|||
deprecate.warn('ipc module', 'require("electron").ipcRenderer')
|
||||
|
||||
// Routes events of ipcRenderer.
|
||||
var ipc = new EventEmitter
|
||||
var ipc = new EventEmitter()
|
||||
|
||||
ipcRenderer.emit = function (channel, event, ...args) {
|
||||
ipc.emit.apply(ipc, [channel].concat(args))
|
||||
|
|
|
@ -5,11 +5,11 @@ const CallbacksRegistry = require('electron').CallbacksRegistry
|
|||
const v8Util = process.atomBinding('v8_util')
|
||||
const IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap
|
||||
|
||||
const callbacksRegistry = new CallbacksRegistry
|
||||
const callbacksRegistry = new CallbacksRegistry()
|
||||
|
||||
var includes = [].includes
|
||||
|
||||
var remoteObjectCache = new IDWeakMap
|
||||
var remoteObjectCache = new IDWeakMap()
|
||||
|
||||
// Check for circular reference.
|
||||
var isCircular = function (field, visited) {
|
||||
|
@ -48,7 +48,7 @@ var wrapArgs = function (args, visited) {
|
|||
} else if ((value != null ? value.constructor.name : void 0) === 'Promise') {
|
||||
return {
|
||||
type: 'promise',
|
||||
then: valueToMeta(function (v) { value.then(v); })
|
||||
then: valueToMeta(function (v) { value.then(v) })
|
||||
}
|
||||
} else if ((value != null) && typeof value === 'object' && v8Util.getHiddenValue(value, 'atomId')) {
|
||||
return {
|
||||
|
@ -94,8 +94,7 @@ var wrapArgs = function (args, visited) {
|
|||
// This matches |getObjectMemebers| in rpc-server.
|
||||
let setObjectMembers = function (object, metaId, members) {
|
||||
for (let member of members) {
|
||||
if (object.hasOwnProperty(member.name))
|
||||
continue
|
||||
if (object.hasOwnProperty(member.name)) continue
|
||||
|
||||
let descriptor = { enumerable: member.enumerable }
|
||||
if (member.type === 'method') {
|
||||
|
@ -134,8 +133,7 @@ let setObjectMembers = function (object, metaId, members) {
|
|||
// Populate object's prototype from descriptor.
|
||||
// This matches |getObjectPrototype| in rpc-server.
|
||||
let setObjectPrototype = function (object, metaId, descriptor) {
|
||||
if (descriptor === null)
|
||||
return
|
||||
if (descriptor === null) return
|
||||
let proto = {}
|
||||
setObjectMembers(proto, metaId, descriptor.members)
|
||||
setObjectPrototype(proto, metaId, descriptor.proto)
|
||||
|
@ -169,8 +167,7 @@ let metaToValue = function (meta) {
|
|||
case 'exception':
|
||||
throw new Error(meta.message + '\n' + meta.stack)
|
||||
default:
|
||||
if (remoteObjectCache.has(meta.id))
|
||||
return remoteObjectCache.get(meta.id)
|
||||
if (remoteObjectCache.has(meta.id)) return remoteObjectCache.get(meta.id)
|
||||
|
||||
if (meta.type === 'function') {
|
||||
// A shadow class to represent the remote function object.
|
||||
|
@ -220,7 +217,7 @@ var metaToPlainObject = function (meta) {
|
|||
obj = (function () {
|
||||
switch (meta.type) {
|
||||
case 'error':
|
||||
return new Error
|
||||
return new Error()
|
||||
default:
|
||||
return {}
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ globalPaths.push(path.join(__dirname, 'api', 'exports'))
|
|||
// The global variable will be used by ipc for event dispatching
|
||||
var v8Util = process.atomBinding('v8_util')
|
||||
|
||||
v8Util.setHiddenValue(global, 'ipc', new events.EventEmitter)
|
||||
v8Util.setHiddenValue(global, 'ipc', new events.EventEmitter())
|
||||
|
||||
// Use electron module after everything is ready.
|
||||
const electron = require('electron')
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
/* globals Event */
|
||||
|
||||
'use strict'
|
||||
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
|
@ -199,7 +201,7 @@ if (process.openerId != null) {
|
|||
}
|
||||
|
||||
ipcRenderer.on('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', function (event, isVisible, isMinimized) {
|
||||
var hasChanged = _isVisible != isVisible || _isMinimized != isMinimized
|
||||
var hasChanged = _isVisible !== isVisible || _isMinimized !== isMinimized
|
||||
|
||||
if (hasChanged) {
|
||||
_isVisible = isVisible
|
||||
|
|
|
@ -40,7 +40,7 @@ class WebViewAttribute {
|
|||
setValueIgnoreMutation (value) {
|
||||
this.ignoreMutation = true
|
||||
this.setValue(value)
|
||||
return this.ignoreMutation = false
|
||||
this.ignoreMutation = false
|
||||
}
|
||||
|
||||
// Defines this attribute as a property on the webview node.
|
||||
|
|
|
@ -423,8 +423,7 @@ var registerWebViewElement = function () {
|
|||
let requestId = getNextId()
|
||||
ipcRenderer.send('ATOM_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', requestId, internal.guestInstanceId, 'executeJavaScript', code, hasUserGesture)
|
||||
ipcRenderer.once(`ATOM_RENDERER_ASYNC_CALL_TO_GUEST_VIEW_RESPONSE_${requestId}`, function (event, result) {
|
||||
if (callback)
|
||||
callback(result)
|
||||
if (callback) callback(result)
|
||||
})
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue