diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-09 19:57:03 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-09 19:57:03 +0800 |
| commit | a5907a8239c2d60ee5491ae2a33b105480798c6a (patch) | |
| tree | 7dbc6ce1febbc8140b6095ab26b7adc4bd465736 | |
| parent | 2a6c84984aace51e64fe87ca6770da0208b3b65f (diff) | |
| parent | c9015e2e04729a06cbcfd650ebfb0c1e71d96ce3 (diff) | |
| download | dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.gz dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.bz2 dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.lz dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.xz dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.zst dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.zip | |
Merge branch 'master' of https://github.com/ethereum/ethereum.js
| -rw-r--r-- | lib/web3.js | 3 | ||||
| -rw-r--r-- | lib/websocket.js | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/web3.js b/lib/web3.js index b240bdae2..9a85c4d1b 100644 --- a/lib/web3.js +++ b/lib/web3.js @@ -505,4 +505,5 @@ function messageHandler(data) { } } -module.exports = web3; +if (typeof(module) !== "undefined") + module.exports = web3; diff --git a/lib/websocket.js b/lib/websocket.js index ddb44aed5..5b40075e4 100644 --- a/lib/websocket.js +++ b/lib/websocket.js @@ -74,4 +74,5 @@ Object.defineProperty(WebSocketProvider.prototype, "onmessage", { set: function(provider) { this.onMessage(provider); } }); -module.exports = WebSocketProvider; +if (typeof(module) !== "undefined") + module.exports = WebSocketProvider; |