From bbd6df0a830c823d7b8a40c97e89e15ae494d326 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Mon, 27 Jul 2015 11:01:12 +0200
Subject: [PATCH] isFinite behaves differently in go js env

---
 lib/utils/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/utils.js b/lib/utils/utils.js
index c4d4256..7da11b1 100644
--- a/lib/utils/utils.js
+++ b/lib/utils/utils.js
@@ -230,10 +230,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);