diff options
| author | Marian Oancea <contact@siteshop.ro> | 2014-11-10 19:57:49 +0800 |
|---|---|---|
| committer | Marian Oancea <contact@siteshop.ro> | 2014-11-10 19:57:49 +0800 |
| commit | c91e4afe6c94b46bb717951bf96fd491ca817d9b (patch) | |
| tree | 6ddad3fd0de440ee964dc31da3b46af7cb2c54e4 /lib/httprpc.js | |
| parent | a2d8b8928949c589ad0282fbb1b9abf783f53c98 (diff) | |
| parent | e3ad9be4c8053c18ed30775d62692f6fe91b1451 (diff) | |
| download | go-tangerine-c91e4afe6c94b46bb717951bf96fd491ca817d9b.tar go-tangerine-c91e4afe6c94b46bb717951bf96fd491ca817d9b.tar.gz go-tangerine-c91e4afe6c94b46bb717951bf96fd491ca817d9b.tar.bz2 go-tangerine-c91e4afe6c94b46bb717951bf96fd491ca817d9b.tar.lz go-tangerine-c91e4afe6c94b46bb717951bf96fd491ca817d9b.tar.xz go-tangerine-c91e4afe6c94b46bb717951bf96fd491ca817d9b.tar.zst go-tangerine-c91e4afe6c94b46bb717951bf96fd491ca817d9b.zip | |
fix merge conflicts
Diffstat (limited to 'lib/httprpc.js')
| -rw-r--r-- | lib/httprpc.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/httprpc.js b/lib/httprpc.js index c1ee0f02a..99f02b532 100644 --- a/lib/httprpc.js +++ b/lib/httprpc.js @@ -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) { |