gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Marian Oancea
2014-11-10 13:57:49 +02:00
parent a2d8b89289 e3ad9be4c8
commit c91e4afe6c
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/httprpc.js
View File

@@ -45,7 +45,8 @@ if(process.env.NODE_ENV !== "build") {
return {
_id: object.id,
data: object.result
data: object.result,
error: object.error
};
}
@@ -75,7 +76,7 @@ if(process.env.NODE_ENV !== "build") {
var self = this;
this.sendRequest(payload, function (request) {
var parsed = JSON.parse(request.responseText);
if (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result) {
if (parsed.error || (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result)) {
return;
}
self.handlers.forEach(function (handler) {