Commit 7e0799ff authored by obscuren's avatar obscuren

Merge commit '9d84609b' into develop

parents c64852db 9d84609b
...@@ -1043,33 +1043,16 @@ var ProviderManager = function() { ...@@ -1043,33 +1043,16 @@ var ProviderManager = function() {
var self = this; var self = this;
var poll = function () { var poll = function () {
if (self.provider) { self.polls.forEach(function (data) {
var pollsBatch = self.polls.map(function (data) { var result = self.send(data.data);
return data.data;
});
var payload = jsonrpc.toBatchPayload(pollsBatch);
var results = self.provider.send(payload);
self.polls.forEach(function (data, index) {
var result = results[index];
if (!jsonrpc.isValidResponse(result)) {
console.log(result);
return;
}
result = result.result;
// dont call the callback if result is not an array, or empty one
if (!(result instanceof Array) || result.length === 0) {
return;
}
data.callback(result); if (!(result instanceof Array) || result.length === 0) {
return;
}
}); data.callback(result);
});
}
setTimeout(poll, 1000); setTimeout(poll, 1000);
}; };
poll(); poll();
......
...@@ -42,33 +42,16 @@ var ProviderManager = function() { ...@@ -42,33 +42,16 @@ var ProviderManager = function() {
var self = this; var self = this;
var poll = function () { var poll = function () {
if (self.provider) { self.polls.forEach(function (data) {
var pollsBatch = self.polls.map(function (data) { var result = self.send(data.data);
return data.data;
});
var payload = jsonrpc.toBatchPayload(pollsBatch); if (!(result instanceof Array) || result.length === 0) {
var results = self.provider.send(payload); return;
}
self.polls.forEach(function (data, index) { data.callback(result);
var result = results[index]; });
if (!jsonrpc.isValidResponse(result)) {
console.log(result);
return;
}
result = result.result;
// dont call the callback if result is not an array, or empty one
if (!(result instanceof Array) || result.length === 0) {
return;
}
data.callback(result);
});
}
setTimeout(poll, 1000); setTimeout(poll, 1000);
}; };
poll(); poll();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment