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

standardize by hand

Browse source
This commit is contained in:
Zeke Sikelianos 2016-03-28 17:35:49 -07:00 • committed by Kevin Sawicki
parent cfdfdc8ccc
commit e6698102c9
13 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/renderer/api/ipc.js
View file

@ -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))

17
lib/renderer/api/remote.js
View file

@ -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 {}
}