Merge pull request #1614 from obscuren/web3-finite-fix

web3: regression. Fixes #1613
This commit is contained in:
Jeffrey Wilcke 2015-08-07 04:59:15 -07:00
commit b1fac4270d

View File

@ -1137,10 +1137,10 @@ var toHex = function (val) {
if (isString(val)) {
if (val.indexOf('-0x') === 0)
return fromDecimal(val);
else if (!isFinite(val))
return fromAscii(val);
else if(val.indexOf('0x') === 0)
return val;
else if (!isFinite(val))
return fromAscii(val);
}
return fromDecimal(val);