improved filter interval

This commit is contained in:
Fabian Vogelsteller 2015-06-05 11:04:06 +02:00
parent ddafe0027a
commit d9ce08e49e
8 changed files with 43 additions and 22 deletions

9
dist/web3-light.js vendored
View File

@ -2435,7 +2435,7 @@ Filter.prototype.watch = function (callback) {
if(self.filterId || self.filterError)
clearInterval(intervalId);
if(self.filterError || !self.filterId)
if(!self.filterId)
return;
self.callbacks.push(callback);
@ -3903,9 +3903,16 @@ RequestManager.prototype.poll = function () {
}
results.map(function (result, index) {
// make sure the filter is still installed after arrival of the request
if(self.polls[index]) {
result.callback = self.polls[index].callback;
return result;
} else
return false;
}).filter(function (result) {
if(!result)
return false;
var valid = Jsonrpc.getInstance().isValidResponse(result);
if (!valid) {
result.callback(errors.InvalidResponse(result));

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

9
dist/web3.js vendored
View File

@ -2435,7 +2435,7 @@ Filter.prototype.watch = function (callback) {
if(self.filterId || self.filterError)
clearInterval(intervalId);
if(self.filterError || !self.filterId)
if(!self.filterId)
return;
self.callbacks.push(callback);
@ -3903,9 +3903,16 @@ RequestManager.prototype.poll = function () {
}
results.map(function (result, index) {
// make sure the filter is still installed after arrival of the request
if(self.polls[index]) {
result.callback = self.polls[index].callback;
return result;
} else
return false;
}).filter(function (result) {
if(!result)
return false;
var valid = Jsonrpc.getInstance().isValidResponse(result);
if (!valid) {
result.callback(errors.InvalidResponse(result));

6
dist/web3.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/web3.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -101,7 +101,7 @@ Filter.prototype.watch = function (callback) {
if(self.filterId || self.filterError)
clearInterval(intervalId);
if(self.filterError || !self.filterId)
if(!self.filterId)
return;
self.callbacks.push(callback);

View File

@ -226,9 +226,16 @@ RequestManager.prototype.poll = function () {
}
results.map(function (result, index) {
// make sure the filter is still installed after arrival of the request
if(self.polls[index]) {
result.callback = self.polls[index].callback;
return result;
} else
return false;
}).filter(function (result) {
if(!result)
return false;
var valid = Jsonrpc.getInstance().isValidResponse(result);
if (!valid) {
result.callback(errors.InvalidResponse(result));