gulp

dist/web3-light.js

@@ -1997,9 +1997,6 @@ var toAscii = function(hex) {
     }
     for (; i < l; i+=2) {
         var code = parseInt(hex.substr(i, 2), 16);
-        if (code === 0) {
-            break;
-        }
         str += String.fromCharCode(code);
     }
 
@@ -2037,9 +2034,6 @@ var fromAscii = function(str) {
     var hex = "";
     for(var i = 0; i < str.length; i++) {
         var code = str.charCodeAt(i);
-        if (code === 0) {
-            break;
-        }
         var n = code.toString(16);
         hex += n.length < 2 ? '0' + n : n;
     }
@@ -2135,7 +2129,7 @@ var toHex = function (val) {
         else if(val.indexOf('0x') === 0)
             return val;
         else if (!isFinite(val))
-            return fromUtf8(val);
+            return fromAscii(val);
     }
 
     return fromDecimal(val);
@@ -2401,7 +2395,6 @@ module.exports = {
     isJson: isJson
 };
 
-
 },{"bignumber.js":"bignumber.js","utf8":49}],21:[function(require,module,exports){
 module.exports={
     "version": "0.12.1"

dist/web3.js

@@ -1997,9 +1997,6 @@ var toAscii = function(hex) {
     }
     for (; i < l; i+=2) {
         var code = parseInt(hex.substr(i, 2), 16);
-        if (code === 0) {
-            break;
-        }
         str += String.fromCharCode(code);
     }
 
@@ -2037,9 +2034,6 @@ var fromAscii = function(str) {
     var hex = "";
     for(var i = 0; i < str.length; i++) {
         var code = str.charCodeAt(i);
-        if (code === 0) {
-            break;
-        }
         var n = code.toString(16);
         hex += n.length < 2 ? '0' + n : n;
     }
@@ -2135,7 +2129,7 @@ var toHex = function (val) {
         else if(val.indexOf('0x') === 0)
             return val;
         else if (!isFinite(val))
-            return fromUtf8(val);
+            return fromAscii(val);
     }
 
     return fromDecimal(val);
@@ -2401,7 +2395,6 @@ module.exports = {
     isJson: isJson
 };
 
-
 },{"bignumber.js":"bignumber.js","utf8":49}],21:[function(require,module,exports){
 module.exports={
     "version": "0.12.1"