web3 in global namespace

web3 · Apr 9, 2015 · 0ccc05a · 0ccc05a
1 parent ccc59d1
commit 0ccc05a
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 28 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/index.js b/index.js
@@ -1,14 +1,13 @@
-// dont override global variable
-if (typeof web3 !== 'undefined') {
-    var web3;
-}
-
-web3 = require('./lib/web3');
+var web3 = require('./lib/web3');
 web3.providers.HttpProvider = require('./lib/web3/httpprovider');
 web3.providers.QtSyncProvider = require('./lib/web3/qtsync');
 web3.eth.contract = require('./lib/web3/contract');
 web3.abi = require('./lib/solidity/abi');
 
-
+// dont override global variable
+if (typeof window !== 'undefined' && typeof window.web3 === 'undefined') {
+    window.web3 = web3;
+}
 
 module.exports = web3;
+