Merge branch 'master' of https://github.com/ethereum/ethereum.js

10 years ago · a5907a8239
2 changed files with 4 additions and 2 deletions
--- 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;
--- 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;