status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed #51

This commit is contained in:
Marek Kotewicz 2015-02-06 10:39:06 +01:00
parent 03661d3bc2
commit 26561e4767
6 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dist/ethereum.js vendored
View File

@ -826,7 +826,7 @@ var filter = function(options, implementation, formatter) {
}); });
}; };
implementation.startPolling(filterId, onMessages); implementation.startPolling(filterId, onMessages, uninstall);
var changed = function (callback) { var changed = function (callback) {
callbacks.push(callback); callbacks.push(callback);
@ -1221,8 +1221,8 @@ var requestManager = function() {
provider = p; provider = p;
}; };
var startPolling = function (data, pollId, callback) { var startPolling = function (data, pollId, callback, uninstall) {
polls.push({data: data, id: pollId, callback: callback}); polls.push({data: data, id: pollId, callback: callback, uninstall: uninstall});
}; };
var stopPolling = function (pollId) { var stopPolling = function (pollId) {
@ -1234,6 +1234,13 @@ var requestManager = function() {
} }
}; };
var reset = function () {
polls.forEach(function (poll) {
poll.uninstall(poll.id);
});
polls = [];
};
var poll = function () { var poll = function () {
polls.forEach(function (data) { polls.forEach(function (data) {
var result = send(data.data); var result = send(data.data);
@ -1251,7 +1258,8 @@ var requestManager = function() {
send: send, send: send,
setProvider: setProvider, setProvider: setProvider,
startPolling: startPolling, startPolling: startPolling,
stopPolling: stopPolling stopPolling: stopPolling,
reset: reset
}; };
}; };
@ -1656,11 +1664,11 @@ var setupProperties = function (obj, properties) {
}); });
}; };
var startPolling = function (method, id, callback) { var startPolling = function (method, id, callback, uninstall) {
web3.manager.startPolling({ web3.manager.startPolling({
method: method, method: method,
params: [id] params: [id]
}, id, callback); }, id, callback, uninstall);
}; };
var stopPolling = function (id) { var stopPolling = function (id) {
@ -1739,6 +1747,12 @@ var web3 = {
}, },
setProvider: function (provider) { setProvider: function (provider) {
web3.manager.setProvider(provider); web3.manager.setProvider(provider);
},
/// Should be called to reset state of web3 object
/// Resets everything except manager
reset: function () {
web3.manager.reset();
} }
}; };

8
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/filter.js
View File

@ -83,7 +83,7 @@ var filter = function(options, implementation, formatter) {
}); });
}; };
implementation.startPolling(filterId, onMessages); implementation.startPolling(filterId, onMessages, uninstall);
var changed = function (callback) { var changed = function (callback) {
callbacks.push(callback); callbacks.push(callback);

14
lib/requestmanager.js
View File

@ -57,8 +57,8 @@ var requestManager = function() {
provider = p; provider = p;
}; };
var startPolling = function (data, pollId, callback) { var startPolling = function (data, pollId, callback, uninstall) {
polls.push({data: data, id: pollId, callback: callback}); polls.push({data: data, id: pollId, callback: callback, uninstall: uninstall});
}; };
var stopPolling = function (pollId) { var stopPolling = function (pollId) {
@ -70,6 +70,13 @@ var requestManager = function() {
} }
}; };
var reset = function () {
polls.forEach(function (poll) {
poll.uninstall(poll.id);
});
polls = [];
};
var poll = function () { var poll = function () {
polls.forEach(function (data) { polls.forEach(function (data) {
var result = send(data.data); var result = send(data.data);
@ -87,7 +94,8 @@ var requestManager = function() {
send: send, send: send,
setProvider: setProvider, setProvider: setProvider,
startPolling: startPolling, startPolling: startPolling,
stopPolling: stopPolling stopPolling: stopPolling,
reset: reset
}; };
}; };

10
lib/web3.js
View File

@ -80,11 +80,11 @@ var setupProperties = function (obj, properties) {
}); });
}; };
var startPolling = function (method, id, callback) { var startPolling = function (method, id, callback, uninstall) {
web3.manager.startPolling({ web3.manager.startPolling({
method: method, method: method,
params: [id] params: [id]
}, id, callback); }, id, callback, uninstall);
}; };
var stopPolling = function (id) { var stopPolling = function (id) {
@ -163,6 +163,12 @@ var web3 = {
}, },
setProvider: function (provider) { setProvider: function (provider) {
web3.manager.setProvider(provider); web3.manager.setProvider(provider);
},
/// Should be called to reset state of web3 object
/// Resets everything except manager
reset: function () {
web3.manager.reset();
} }
}; };