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

Fix passing Promise with remote

Browse source 
Somehow using value.then.bind(value) would result in infinite loop,
could be bug of Chromium.
This commit is contained in:
Cheng Zhao 2016-03-09 20:03:42 +09:00
parent dd4d3db47b
commit 6de9c4332f
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,7 @@ var valueToMeta = function(sender, value, optimizeSimpleObject) {
} else if (meta.type === 'buffer') {
meta.value = Array.prototype.slice.call(value, 0);
} else if (meta.type === 'promise') {
meta.then = valueToMeta(sender, value.then.bind(value));
meta.then = valueToMeta(sender, function(v) { value.then(v); });
} else if (meta.type === 'error') {
meta.members = plainObjectToMeta(value);

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

@ -48,7 +48,7 @@ var wrapArgs = function(args, visited) {
} else if ((value != null ? value.constructor.name : void 0) === 'Promise') {
return {
type: 'promise',
then: valueToMeta(value.then.bind(value))
then: valueToMeta(function(v) { value.then(v); })
};
} else if ((value != null) && typeof value === 'object' && v8Util.getHiddenValue(value, 'atomId')) {
return {