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

replace isEventEmitter with instanceof EventEmitter (rpc-server) (#12998)

Browse source
This commit is contained in:
Milan Burda 2018-05-21 03:00:56 +02:00 committed by Cheng Zhao
parent 8b2bffcf9e
commit 7c19ae302e
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/browser/rpc-server.js
View file

@ -147,17 +147,11 @@ const throwRPCError = function (message) {
throw error throw error
} }
const isEventEmitter = (object) => {
if (!object) return false
const prototype = Object.getPrototypeOf(object)
return prototype === EventEmitter.prototype || isEventEmitter(prototype)
}
const removeRemoteListenersAndLogWarning = (sender, meta, callIntoRenderer) => { const removeRemoteListenersAndLogWarning = (sender, meta, callIntoRenderer) => {
let message = `Attempting to call a function in a renderer window that has been closed or released.` + let message = `Attempting to call a function in a renderer window that has been closed or released.` +
`\nFunction provided here: ${meta.location}` `\nFunction provided here: ${meta.location}`
if (isEventEmitter(sender)) { if (sender instanceof EventEmitter) {
const remoteEvents = sender.eventNames().filter((eventName) => { const remoteEvents = sender.eventNames().filter((eventName) => {
return sender.listeners(eventName).includes(callIntoRenderer) return sender.listeners(eventName).includes(callIntoRenderer)
}) })