mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-20 20:00:40 +03:00
Code Activity

Merge pull request #279 from Deamon87/patch-1

Browse Source 
Fixing xhr for webworker env
This commit is contained in:
Matt Zabriskie
2016-03-28 22:09:50 -06:00
parent 92e15fa0d1 8972ea5208
commit 34dbdff846
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adapters/xhr.js
+2 -2
View File
@@ -5,7 +5,7 @@ var buildURL = require('./../helpers/buildURL');
var parseHeaders = require('./../helpers/parseHeaders'); var parseHeaders = require('./../helpers/parseHeaders');
var transformData = require('./../helpers/transformData'); var transformData = require('./../helpers/transformData');
var isURLSameOrigin = require('./../helpers/isURLSameOrigin'); var isURLSameOrigin = require('./../helpers/isURLSameOrigin');
var btoa = window.btoa || require('./../helpers/btoa'); var btoa = (typeof window !== 'undefined' && window.btoa) || require('./../helpers/btoa');
module.exports = function xhrAdapter(resolve, reject, config) { module.exports = function xhrAdapter(resolve, reject, config) {
var requestData = config.data; var requestData = config.data;
@@ -22,7 +22,7 @@ module.exports = function xhrAdapter(resolve, reject, config) {
// For IE 8/9 CORS support // For IE 8/9 CORS support
// Only supports POST and GET calls and doesn't returns the response headers. // Only supports POST and GET calls and doesn't returns the response headers.
// DON'T do this for testing b/c XMLHttpRequest is mocked, not XDomainRequest. // DON'T do this for testing b/c XMLHttpRequest is mocked, not XDomainRequest.
if (process.env.NODE_ENV !== 'test' && window.XDomainRequest && !('withCredentials' in request) && !isURLSameOrigin(config.url)) { if (process.env.NODE_ENV !== 'test' && typeof window !== 'undefined' && window.XDomainRequest && !('withCredentials' in request) && !isURLSameOrigin(config.url)) {
request = new window.XDomainRequest(); request = new window.XDomainRequest();
loadEvent = 'onload'; loadEvent = 'onload';
xDomain = true; xDomain = true;