Merge pull request #106 from ConsenSys/URL_fix

Change initialization of URL class for browser compatibility
Consensys · Apr 26, 2019 · 356bd60 · 356bd60
2 parents 3b63a23 + adc2bdb
commit 356bd60
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -1,5 +1,6 @@
 var URL
-URL = URL || require('url').URL
+URL = (typeof window !== 'undefined' && window.URL)
+  ? window.URL : require('url').URL
 
 const requester = require('./lib/requester')
 const simpleRequester = require('./lib/simpleRequester')

diff --git a/lib/util.js b/lib/util.js
@@ -1,5 +1,6 @@
 var URL
-URL = URL || require('url').URL
+URL = (typeof window !== 'undefined' && window.URL)
+  ? window.URL : require('url').URL
 
 /**
  * Wait for the specified time.

diff --git a/test/index.js b/test/index.js
@@ -1,5 +1,6 @@
 var URL
-URL = URL || require('url').URL
+URL = (typeof window !== 'undefined' && window.URL)
+  ? window.URL : require('url').URL
 
 const armlet = require('../index')
 const Client = require('../index').Client

diff --git a/test/lib/analysisPoller.js b/test/lib/analysisPoller.js
@@ -1,5 +1,6 @@
 var URL
-URL = URL || require('url').URL
+URL = (typeof window !== 'undefined' && window.URL)
+  ? window.URL : require('url').URL
 
 const nock = require('nock')
 const sinon = require('sinon')

diff --git a/test/lib/login.js b/test/lib/login.js
@@ -1,5 +1,6 @@
 var URL
-URL = URL || require('url').URL
+URL = (typeof window !== 'undefined' && window.URL)
+  ? window.URL : require('url').URL
 
 const nock = require('nock')
 require('chai')

diff --git a/test/lib/refresh.js b/test/lib/refresh.js
@@ -1,5 +1,6 @@
 var URL
-URL = URL || require('url').URL
+URL = (typeof window !== 'undefined' && window.URL)
+  ? window.URL : require('url').URL
 
 const nock = require('nock')
 require('chai')

diff --git a/test/lib/requester.js b/test/lib/requester.js
@@ -1,5 +1,6 @@
 var URL
-URL = URL || require('url').URL
+URL = (typeof window !== 'undefined' && window.URL)
+  ? window.URL : require('url').URL
 
 const nock = require('nock')
 require('chai')