diff options
author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-16 23:49:50 +0800 |
---|---|---|
committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-16 23:49:50 +0800 |
commit | 1c4d8f36e4c11944c4c819c822fdd44ff34f962b (patch) | |
tree | 45ff55da30674918efde7c35da7774a3e8946461 /lib/web3.js | |
parent | de4ea8e6f41459f1f3f44ee144381dd62671e866 (diff) | |
parent | e94da808cb2a9f0493b42e5e572f6aed78de5ee3 (diff) | |
download | dexon-1c4d8f36e4c11944c4c819c822fdd44ff34f962b.tar dexon-1c4d8f36e4c11944c4c819c822fdd44ff34f962b.tar.gz dexon-1c4d8f36e4c11944c4c819c822fdd44ff34f962b.tar.bz2 dexon-1c4d8f36e4c11944c4c819c822fdd44ff34f962b.tar.lz dexon-1c4d8f36e4c11944c4c819c822fdd44ff34f962b.tar.xz dexon-1c4d8f36e4c11944c4c819c822fdd44ff34f962b.tar.zst dexon-1c4d8f36e4c11944c4c819c822fdd44ff34f962b.zip |
Merge commit '29333fc213b62b27ef826616cf77430947fb6eab' into ethereumjs
Diffstat (limited to 'lib/web3.js')
-rw-r--r-- | lib/web3.js | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/web3.js b/lib/web3.js index 25c2901a8..f071eea49 100644 --- a/lib/web3.js +++ b/lib/web3.js @@ -23,9 +23,6 @@ * @date 2014 */ -var Filter = require('./filter'); -var ProviderManager = require('./providermanager'); - /// Recursively resolves all promises in given object and replaces the resolved values with promises /// @param any object/array/promise/anything else.. /// @returns (resolves) object with replaced promises with their result @@ -319,7 +316,7 @@ var web3 = { /// eth object prototype eth: { watch: function (params) { - return new Filter(params, ethWatch); + return new web3.filter(params, ethWatch); } }, @@ -329,7 +326,7 @@ var web3 = { /// shh object prototype shh: { watch: function (params) { - return new Filter(params, shhWatch); + return new web3.filter(params, shhWatch); } }, @@ -387,8 +384,6 @@ var shhWatch = { setupMethods(shhWatch, shhWatchMethods()); -web3.provider = new ProviderManager(); - web3.setProvider = function(provider) { provider.onmessage = messageHandler; web3.provider.set(provider); @@ -411,5 +406,5 @@ function messageHandler(data) { } } -if (typeof(module) !== "undefined") - module.exports = web3; +module.exports = web3; + |