clearing timeout

This commit is contained in:
Marek Kotewicz 2015-02-25 17:07:16 +01:00
parent 72d7a0c7ac
commit 5bd166cc82
4 changed files with 19 additions and 5 deletions

9
dist/ethereum.js vendored
View File

@ -1211,6 +1211,7 @@ var c = require('./const');
*/ */
var requestManager = function() { var requestManager = function() {
var polls = []; var polls = [];
var timeout = null;
var provider; var provider;
var send = function (data) { var send = function (data) {
@ -1255,6 +1256,12 @@ var requestManager = function() {
poll.uninstall(poll.id); poll.uninstall(poll.id);
}); });
polls = []; polls = [];
if (timeout) {
clearTimeout(timeout);
timeout = null;
}
poll();
}; };
var poll = function () { var poll = function () {
@ -1265,7 +1272,7 @@ var requestManager = function() {
} }
data.callback(result); data.callback(result);
}); });
setTimeout(poll, c.ETH_POLLING_TIMEOUT); timeout = setTimeout(poll, c.ETH_POLLING_TIMEOUT);
}; };
poll(); poll();

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -33,6 +33,7 @@ var c = require('./const');
*/ */
var requestManager = function() { var requestManager = function() {
var polls = []; var polls = [];
var timeout = null;
var provider; var provider;
var send = function (data) { var send = function (data) {
@ -77,6 +78,12 @@ var requestManager = function() {
poll.uninstall(poll.id); poll.uninstall(poll.id);
}); });
polls = []; polls = [];
if (timeout) {
clearTimeout(timeout);
timeout = null;
}
poll();
}; };
var poll = function () { var poll = function () {
@ -87,7 +94,7 @@ var requestManager = function() {
} }
data.callback(result); data.callback(result);
}); });
setTimeout(poll, c.ETH_POLLING_TIMEOUT); timeout = setTimeout(poll, c.ETH_POLLING_TIMEOUT);
}; };
poll(); poll();