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

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Fabian Vogelsteller 2016-01-21 15:30:42 +01:00
parent 5b799b7f7d 93786af361
commit bc1c3c7d7e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -21,7 +21,7 @@ which implements the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/JS
<!-- [![browser support](https://ci.testling.com/ethereum/ethereum.js.png)](https://ci.testling.com/ethereum/ethereum.js) --> <!-- [![browser support](https://ci.testling.com/ethereum/ethereum.js.png)](https://ci.testling.com/ethereum/ethereum.js) -->
You need to run a local ethrereum node to use this library. You need to run a local Ethereum node to use this library.
[Documentation](https://github.com/ethereum/wiki/wiki/JavaScript-API) [Documentation](https://github.com/ethereum/wiki/wiki/JavaScript-API)

10
lib/web3/filter.js
View File

@ -53,7 +53,7 @@ var getOptions = function (options) {
if (utils.isString(options)) { if (utils.isString(options)) {
return options; return options;
} }
options = options || {}; options = options || {};
@ -69,8 +69,8 @@ var getOptions = function (options) {
to: options.to, to: options.to,
address: options.address, address: options.address,
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock), fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
toBlock: formatters.inputBlockNumberFormatter(options.toBlock) toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
}; };
}; };
/** /**
@ -78,7 +78,7 @@ Adds the callback and sets up the methods, to iterate over the results.
@method getLogsAtStart @method getLogsAtStart
@param {Object} self @param {Object} self
@param {funciton} @param {funciton}
*/ */
var getLogsAtStart = function(self, callback){ var getLogsAtStart = function(self, callback){
// call getFilterLogs for the first watch callback start // call getFilterLogs for the first watch callback start
@ -168,7 +168,7 @@ var Filter = function (requestManager, options, methods, formatter, callback) {
pollFilter(self); pollFilter(self);
// start to watch immediately // start to watch immediately
if(callback) { if(typeof callback === 'function') {
return self.watch(callback); return self.watch(callback);
} }
} }