web3: regression. Fixes #1613

a33726b7 · Jeffrey Wilcke · ac10c935 · a33726b7
Commit a33726b7 authored Aug 07, 2015 by Jeffrey Wilcke
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ethereum_js.go jsre/ethereum_js.go +2 -2

No files found.
--- a/jsre/ethereum_js.go
+++ b/jsre/ethereum_js.go
@@ -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);