mirror of
https://github.com/tenrok/axios.git
synced 2026-06-20 20:00:40 +03:00
Adding ESLint
This commit is contained in:
@@ -9,6 +9,8 @@ var pkg = require('./../../package.json');
|
||||
var Buffer = require('buffer').Buffer;
|
||||
|
||||
module.exports = function httpAdapter(resolve, reject, config) {
|
||||
'use strict';
|
||||
|
||||
// Transform request data
|
||||
var data = transformData(
|
||||
config.data,
|
||||
@@ -71,9 +73,9 @@ module.exports = function httpAdapter(resolve, reject, config) {
|
||||
};
|
||||
|
||||
// Resolve or reject the Promise based on the status
|
||||
(res.statusCode >= 200 && res.statusCode < 300
|
||||
? resolve
|
||||
: reject)(response);
|
||||
(res.statusCode >= 200 && res.statusCode < 300 ?
|
||||
resolve :
|
||||
reject)(response);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
+19
-15
@@ -1,3 +1,5 @@
|
||||
/*global ActiveXObject:true*/
|
||||
|
||||
var defaults = require('./../defaults');
|
||||
var utils = require('./../utils');
|
||||
var buildUrl = require('./../helpers/buildUrl');
|
||||
@@ -7,6 +9,8 @@ var transformData = require('./../helpers/transformData');
|
||||
var urlIsSameOrigin = require('./../helpers/urlIsSameOrigin');
|
||||
|
||||
module.exports = function xhrAdapter(resolve, reject, config) {
|
||||
'use strict';
|
||||
|
||||
// Transform request data
|
||||
var data = transformData(
|
||||
config.data,
|
||||
@@ -15,42 +19,42 @@ module.exports = function xhrAdapter(resolve, reject, config) {
|
||||
);
|
||||
|
||||
// Merge headers
|
||||
var headers = utils.merge(
|
||||
var requestHeaders = utils.merge(
|
||||
defaults.headers.common,
|
||||
defaults.headers[config.method] || {},
|
||||
config.headers || {}
|
||||
);
|
||||
|
||||
if (utils.isFormData(data)) {
|
||||
delete headers['Content-Type']; // Let the browser set it
|
||||
delete requestHeaders['Content-Type']; // Let the browser set it
|
||||
}
|
||||
|
||||
// Create the request
|
||||
var request = new(XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
|
||||
var request = new (XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
|
||||
request.open(config.method.toUpperCase(), buildUrl(config.url, config.params), true);
|
||||
|
||||
// Listen for ready state
|
||||
request.onreadystatechange = function () {
|
||||
if (request && request.readyState === 4) {
|
||||
// Prepare the response
|
||||
var headers = parseHeaders(request.getAllResponseHeaders());
|
||||
var responseHeaders = parseHeaders(request.getAllResponseHeaders());
|
||||
var responseData = ['text', ''].indexOf(config.responseType || '') !== -1 ? request.responseText : request.response;
|
||||
var response = {
|
||||
data: transformData(
|
||||
responseData,
|
||||
headers,
|
||||
responseHeaders,
|
||||
config.transformResponse
|
||||
),
|
||||
status: request.status,
|
||||
statusText: request.statusText,
|
||||
headers: headers,
|
||||
headers: responseHeaders,
|
||||
config: config
|
||||
};
|
||||
|
||||
// Resolve or reject the Promise based on the status
|
||||
(request.status >= 200 && request.status < 300
|
||||
? resolve
|
||||
: reject)(response);
|
||||
(request.status >= 200 && request.status < 300 ?
|
||||
resolve :
|
||||
reject)(response);
|
||||
|
||||
// Clean up request
|
||||
request = null;
|
||||
@@ -58,18 +62,18 @@ module.exports = function xhrAdapter(resolve, reject, config) {
|
||||
};
|
||||
|
||||
// Add xsrf header
|
||||
var xsrfValue = urlIsSameOrigin(config.url)
|
||||
? cookies.read(config.xsrfCookieName || defaults.xsrfCookieName)
|
||||
: undefined;
|
||||
var xsrfValue = urlIsSameOrigin(config.url) ?
|
||||
cookies.read(config.xsrfCookieName || defaults.xsrfCookieName) :
|
||||
undefined;
|
||||
if (xsrfValue) {
|
||||
headers[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
|
||||
requestHeaders[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
|
||||
}
|
||||
|
||||
// Add headers to the request
|
||||
utils.forEach(headers, function (val, key) {
|
||||
utils.forEach(requestHeaders, function (val, key) {
|
||||
// Remove Content-Type if data is undefined
|
||||
if (!data && key.toLowerCase() === 'content-type') {
|
||||
delete headers[key];
|
||||
delete requestHeaders[key];
|
||||
}
|
||||
// Otherwise add header to the request
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user