fixed #28 and other small node.js issues

ethereum · Jan 16, 2015 · 0172939 · 0172939
1 parent 2c36d5f
commit 0172939
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 60 deletions.
diff --git a/dist/ethereum.js b/dist/ethereum.js
diff --git a/dist/ethereum.js.map b/dist/ethereum.js.map
diff --git a/dist/ethereum.min.js b/dist/ethereum.min.js
diff --git a/example/contract.html b/example/contract.html
@@ -3,6 +3,7 @@
 
 <head>
 <script type="text/javascript" src="js/es6-promise/promise.min.js"></script>
+<script type="text/javascript" src="../node_modules/bignumber.js/bignumber.min.js"></script>
 <script type="text/javascript" src="../dist/ethereum.js"></script>
 <script type="text/javascript">
 

diff --git a/index.js b/index.js
@@ -1,4 +1,7 @@
 var web3 = require('./lib/web3');
+var ProviderManager = require('./lib/providermanager');
+web3.provider = new ProviderManager();
+web3.filter = require('./lib/filter');
 web3.providers.WebSocketProvider = require('./lib/websocket');
 web3.providers.HttpRpcProvider = require('./lib/httprpc');
 web3.providers.QtProvider = require('./lib/qt');

diff --git a/lib/abi.js b/lib/abi.js
@@ -23,10 +23,10 @@
 
 // TODO: is these line is supposed to be here? 
 if (process.env.NODE_ENV !== 'build') {
-    var web3 = require('./web3'); // jshint ignore:line
+    var BigNumber = require('bignumber.js'); // jshint ignore:line
 }
 
-var BigNumber = require('bignumber.js');
+var web3 = require('./web3'); // jshint ignore:line
 
 // TODO: make these be actually accurate instead of falling back onto JS's doubles.
 var hexToDec = function (hex) {

diff --git a/lib/contract.js b/lib/contract.js
@@ -20,11 +20,7 @@
  * @date 2014
  */
 
-// TODO: is these line is supposed to be here? 
-if (process.env.NODE_ENV !== 'build') {
-    var web3 = require('./web3'); // jshint ignore:line
-}
-
+var web3 = require('./web3'); // jshint ignore:line
 var abi = require('./abi');
 
 /// method signature length in bytes

diff --git a/lib/filter.js b/lib/filter.js
@@ -23,10 +23,7 @@
  * @date 2014
  */
 
-// TODO: is these line is supposed to be here? 
-if (process.env.NODE_ENV !== 'build') {
-    var web3 = require('./web3'); // jshint ignore:line
-}
+var web3 = require('./web3'); // jshint ignore:line
 
 /// should be used when we want to watch something
 /// it's using inner polling mechanism and is notified about changes

diff --git a/lib/providermanager.js b/lib/providermanager.js
@@ -24,9 +24,7 @@
  */
 
 // TODO: is these line is supposed to be here? 
-if (process.env.NODE_ENV !== 'build') {
-    var web3 = require('./web3'); // jshint ignore:line
-}
+var web3 = require('./web3'); // jshint ignore:line
 
 /**
  * Provider manager object prototype

diff --git 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;
+