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

Use ArrayBuffer.isView to detect Buffer and ArrayBuffer

Browse source
This commit is contained in:
Cheng Zhao 2016-07-25 16:39:09 +09:00
parent eb51e080e5
commit 1c9421bc89
5 changed files with 4 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
'use strict'
const v8Util = process.atomBinding('v8_util')
const {ipcRenderer, isPromise, isTypedArray, CallbacksRegistry} = require('electron')
const {ipcRenderer, isPromise, CallbacksRegistry} = require('electron')
const callbacksRegistry = new CallbacksRegistry()
@ -30,16 +30,11 @@ const wrapArgs = function (args, visited) {
}
visited.delete(value)
return meta
} else if (Buffer.isBuffer(value)) {
} else if (ArrayBuffer.isView(value)) {
return {
type: 'buffer',
value: Array.prototype.slice.call(value, 0)
}
} else if (isTypedArray(value)) {
return {
type: 'typed-array',
value: Array.prototype.slice.call(value)
}
} else if (value instanceof Date) {
return {
type: 'date',
@ -169,8 +164,6 @@ const metaToValue = function (meta) {
return results
case 'buffer':
return new Buffer(meta.value)
case 'typed-array':
return Buffer.from(meta.value)
case 'promise':
return Promise.resolve({
then: metaToValue(meta.then)