Merge pull request #21 from debris/master

fixed gulp build
ethereum · Jan 7, 2015 · 6c160ad · 6c160ad
2 parents 1954b87 + b6232cf
commit 6c160ad
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 26 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/index.html → example/balance.html b/example/index.html → example/balance.html
diff --git a/lib/abi.js b/lib/abi.js
@@ -46,7 +46,7 @@ var findMethodIndex = function (json, methodName) {
 };
 
 var padLeft = function (string, chars) {
-    return Array(chars - string.length + 1).join("0") + string;
+    return new Array(chars - string.length + 1).join("0") + string;
 };
 
 var setupInputTypes = function () {

diff --git a/lib/autoprovider.js b/lib/autoprovider.js
@@ -27,12 +27,11 @@
  * if it fails, it uses HttpRpcProvider
  */
 
-// TODO: work out which of the following two lines it is supposed to be...
-//if (process.env.NODE_ENV !== 'build') {
-if ("build" !== 'build') {/*
+// TODO: is these line is supposed to be here? 
+if (process.env.NODE_ENV !== 'build') {
     var WebSocket = require('ws'); // jshint ignore:line
     var web3 = require('./main.js'); // jshint ignore:line
-*/}
+}
 
 var AutoProvider = function (userOptions) {
     if (web3.haveProvider()) {

diff --git a/lib/contract.js b/lib/contract.js
@@ -20,11 +20,11 @@
  * @date 2014
  */
 
-// TODO: work out which of the following two lines it is supposed to be...
-//if (process.env.NODE_ENV !== 'build') {
-if ("build" !== 'build') {/*
+// TODO: is these line is supposed to be here? 
+if (process.env.NODE_ENV !== 'build') {
     var web3 = require('./web3'); // jshint ignore:line
-*/}
+}
+
 var abi = require('./abi');
 
 var contract = function (address, desc) {

diff --git a/lib/httprpc.js b/lib/httprpc.js
@@ -21,11 +21,10 @@
  * @date 2014
  */
 
-// TODO: work out which of the following two lines it is supposed to be...
-//if (process.env.NODE_ENV !== 'build') {
-if ("build" !== "build") {/*
+// TODO: is these line is supposed to be here? 
+if (process.env.NODE_ENV !== 'build') {
     var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
-*/}
+}
 
 var HttpRpcProvider = function (host) {
     this.handlers = [];

diff --git a/lib/main.js b/lib/main.js
@@ -272,7 +272,7 @@ var web3 = {
     },
 
     toEth: function(str) {
-        var val = typeof str === "string" ? str.indexOf('0x') == 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str;
+        var val = typeof str === "string" ? str.indexOf('0x') === 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str;
         var unit = 0;
         var units = [ 'wei', 'Kwei', 'Mwei', 'Gwei', 'szabo', 'finney', 'ether', 'grand', 'Mether', 'Gether', 'Tether', 'Pether', 'Eether', 'Zether', 'Yether', 'Nether', 'Dether', 'Vether', 'Uether' ];
         while (val > 3000 && unit < units.length - 1)
@@ -281,10 +281,14 @@ var web3 = {
             unit++;
         }
         var s = val.toString().length < val.toFixed(2).length ? val.toString() : val.toFixed(2);
+        var replaceFunction = function($0, $1, $2) {
+            return $1 + ',' + $2;
+        };
+
         while (true) {
             var o = s;
-            s = s.replace(/(\d)(\d\d\d[\.\,])/, function($0, $1, $2) { return $1 + ',' + $2; });
-            if (o == s)
+            s = s.replace(/(\d)(\d\d\d[\.\,])/, replaceFunction);
+            if (o === s)
                 break;
         }
         return s + ' ' + units[unit];

diff --git a/lib/websocket.js b/lib/websocket.js
@@ -22,11 +22,10 @@
  * @date 2014
  */
 
-// TODO: work out which of the following two lines it is supposed to be...
-//if (process.env.NODE_ENV !== 'build') {
-if ("build" !== "build") {/*
+// TODO: is these line is supposed to be here? 
+if (process.env.NODE_ENV !== 'build') {
     var WebSocket = require('ws'); // jshint ignore:line
-*/}
+}
 
 var WebSocketProvider = function(host) {
     // onmessage handlers