Merge branch 'web3' into develop

Conflicts: dist/web3-light.js dist/web3-light.js.map dist/web3-light.min.js dist/web3.js dist/web3.js.map dist/web3.min.js
web3 · Apr 9, 2015 · 9c2c946 · 9c2c946
2 parents 6763f34 + 73b9ed2
commit 9c2c946
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 42 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
-  "name": "ethereum.js",
+  "name": "web3",
   "namespace": "ethereum",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Ethereum Compatible JavaScript API",
   "main": [
     "./dist/ethereum.js",

diff --git a/dist/ethereum-light.js → dist/web3-light.js b/dist/ethereum-light.js → dist/web3-light.js
diff --git a/dist/ethereum-light.js.map → dist/web3-light.js.map b/dist/ethereum-light.js.map → dist/web3-light.js.map
diff --git a/dist/ethereum-light.min.js → dist/web3-light.min.js b/dist/ethereum-light.min.js → dist/web3-light.min.js
diff --git a/dist/ethereum.js → dist/web3.js b/dist/ethereum.js → dist/web3.js
diff --git a/dist/ethereum.js.map → dist/web3.js.map b/dist/ethereum.js.map → dist/web3.js.map
diff --git a/dist/ethereum.min.js → dist/web3.min.js b/dist/ethereum.min.js → dist/web3.min.js
diff --git a/example/balance.html b/example/balance.html
@@ -3,10 +3,10 @@
 
 <head>
 <script type="text/javascript" src="../node_modules/bignumber.js/bignumber.min.js"></script>
-<script type="text/javascript" src="../dist/ethereum-light.js"></script>
+<script type="text/javascript" src="../dist/web3-light.js"></script>
 <script type="text/javascript">
 
-    var web3 = require('ethereum.js');
+    var web3 = require('web3');
     web3.setProvider(new web3.providers.HttpProvider());
 
     function watchBalance() {

diff --git a/example/contract.html b/example/contract.html
@@ -2,10 +2,10 @@
 <html>
 
 <head>
-<script type="text/javascript" src="../dist/ethereum.js"></script>
+<script type="text/javascript" src="../dist/web3"></script>
 <script type="text/javascript">
 
-    var web3 = require('ethereum.js');
+    var web3 = require('web3');
     web3.setProvider(new web3.providers.HttpProvider());
 
     // solidity source code

diff --git a/example/contract_with_array.html b/example/contract_with_array.html
@@ -2,10 +2,10 @@
 <html>
 
 <head>
-<script type="text/javascript" src="../dist/ethereum.js"></script>
+<script type="text/javascript" src="../dist/web3.js"></script>
 <script type="text/javascript">
 
-    var web3 = require('ethereum.js');
+    var web3 = require('web3');
     web3.setProvider(new web3.providers.HttpProvider());
 
     // solidity source code

diff --git a/example/event.html b/example/event.html
@@ -1,9 +1,9 @@
 <!doctype>
 <html>
     <head>
-    <script type="text/javascript" src="../dist/ethereum.js"></script>
+    <script type="text/javascript" src="../dist/web3.js"></script>
     <script type="text/javascript">
-        var web3 = require('ethereum.js');
+        var web3 = require('web3');
         web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080'));
 
         var desc = [{

diff --git a/example/event_inc.html b/example/event_inc.html
@@ -1,9 +1,9 @@
 <!doctype>
 <html>
     <head>
-    <script type="text/javascript" src="../dist/ethereum.js"></script>
+    <script type="text/javascript" src="../dist/web3.js"></script>
     <script type="text/javascript">
-        var web3 = require('ethereum.js');
+        var web3 = require('web3');
         web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080'));
 
         var source = "" + 

diff --git a/example/natspec_contract.html b/example/natspec_contract.html
@@ -2,10 +2,10 @@
 <html>
 
 <head>
-<script type="text/javascript" src="../dist/ethereum.js"></script>
+<script type="text/javascript" src="../dist/web3.js"></script>
 <script type="text/javascript">
 
-    var web3 = require('ethereum.js');
+    var web3 = require('web3');
     web3.setProvider(new web3.providers.HttpProvider());
 
     // solidity source code

diff --git a/gulpfile.js b/gulpfile.js
@@ -19,8 +19,8 @@ var replace = require('gulp-replace');
 
 var DEST = './dist/';
 var src = 'index';
-var dst = 'ethereum';
-var lightDst = 'ethereum-light';
+var dst = 'web3';
+var lightDst = 'web3-light';
 
 var browserifyOptions = {
     debug: true,
@@ -60,7 +60,7 @@ gulp.task('lint', function(){
 
 gulp.task('buildLight', ['clean'], function () {
     return browserify(browserifyOptions)
-        .require('./' + src + '.js', {expose: 'ethereum.js'})
+        .require('./' + src + '.js', {expose: 'web3'})
         .ignore('bignumber.js')
         .require('./lib/utils/browser-bn.js', {expose: 'bignumber.js'}) // fake bignumber.js
         .add('./' + src + '.js')
@@ -75,7 +75,7 @@ gulp.task('buildLight', ['clean'], function () {
 
 gulp.task('buildStandalone', ['clean'], function () {
     return browserify(browserifyOptions)
-        .require('./' + src + '.js', {expose: 'ethereum.js'})
+        .require('./' + src + '.js', {expose: 'web3'})
         .require('bignumber.js') // expose it to dapp users
         .add('./' + src + '.js')
         .ignore('crypto')

diff --git a/index.js b/index.js
@@ -1,7 +1,14 @@
-var web3 = require('./lib/web3');
+// dont override global variable
+if (typeof web3 !== 'undefined') {
+    var web3;
+}
+
+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');
 
+
+
 module.exports = web3;
diff --git a/lib/version.json b/lib/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "0.2.4"
+    "version": "0.2.5"
 }
diff --git a/package.js b/package.js
@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
   name: 'ethereum:js',
-  version: '0.2.4',
+  version: '0.2.5',
   summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
   git: 'https://github.com/ethereum/ethereum.js',
   // By default, Meteor will default to using README.md for documentation.

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "ethereum.js",
+  "name": "web3",
   "namespace": "ethereum",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Ethereum JavaScript API, middleware to talk to a ethereum node over RPC",
   "main": "./index.js",
   "directories": {