Merge pull request #3 from uport-project/feature/meteor-support

add meteor support for xmlhttprequest
uport-project · Feb 15, 2017 · e25ad30 · e25ad30
2 parents 1b77c3f + c0fc8d3
commit e25ad30
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -26,9 +26,7 @@
     "xmlhttprequest": "^1.8.0"
   },
   "browser": {
-    "xmlhttprequest": false,
-    "./src/lib/XMLHttpRequest.js": "./src/lib/XMLHttpRequest-browser.js",
-    "./lib/lib/XMLHttpRequest.js": "./lib/lib/XMLHttpRequest-browser.js"
+    "xmlhttprequest": false
   },
   "jest": {
     "coverageDirectory": "./coverage/",

diff --git a/src/index.js b/src/index.js
@@ -2,7 +2,7 @@ var BASE58 = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
 var base58 = require('base-x-bytearray')(BASE58)
 var hex = require('base-x-bytearray')('0123456789abcdef')
 
-const XMLHttpRequest = require('./lib/XMLHttpRequest')
+const XMLHttpRequest = window.XMLHttpRequest || require('xmlhttprequest').XMLHttpRequest
 
 const getAttributesData = '0x446d5aa4000000000000000000000000'
 function http (opts, callback) {
@@ -84,4 +84,4 @@ function UportLite (opts = {}) {
   return getAttributes
 }
 
-module.exports = UportLite
+module.exports = UportLite
diff --git a/src/lib/XMLHttpRequest-browser.js b/src/lib/XMLHttpRequest-browser.js
diff --git a/src/lib/XMLHttpRequest.js b/src/lib/XMLHttpRequest.js