mirror of
https://github.com/tenrok/axios.git
synced 2026-06-20 20:00:40 +03:00
Moving utility functions into utils
This commit is contained in:
+8
-9
@@ -1,13 +1,12 @@
|
||||
var Promise = require('es6-promise').Promise;
|
||||
var buildUrl = require('./buildUrl');
|
||||
var defaults = require('./defaults');
|
||||
var forEach = require('./forEach');
|
||||
var merge = require('./merge');
|
||||
var parseHeaders = require('./parseHeaders');
|
||||
var transformData = require('./transformData');
|
||||
var utils = require('./utils');
|
||||
|
||||
var axios = module.exports = function axios(options) {
|
||||
options = merge({
|
||||
options = utils.merge({
|
||||
method: 'get',
|
||||
transformRequest: defaults.transformRequest,
|
||||
transformResponse: defaults.transformResponse
|
||||
@@ -57,13 +56,13 @@ var axios = module.exports = function axios(options) {
|
||||
};
|
||||
|
||||
// Merge headers and add to request
|
||||
var headers = merge(
|
||||
var headers = utils.merge(
|
||||
defaults.headers.common,
|
||||
defaults.headers[options.method] || {},
|
||||
options.headers || {}
|
||||
);
|
||||
|
||||
forEach(headers, function (val, key) {
|
||||
utils.forEach(headers, function (val, key) {
|
||||
// Remove Content-Type if data is undefined
|
||||
if (typeof data === 'undefined' && key.toLowerCase() === 'content-type') {
|
||||
delete headers[key];
|
||||
@@ -121,9 +120,9 @@ createShortMethods('delete', 'get', 'head');
|
||||
createShortMethodsWithData('post', 'put', 'patch');
|
||||
|
||||
function createShortMethods() {
|
||||
forEach(arguments, function (method) {
|
||||
utils.forEach(arguments, function (method) {
|
||||
axios[method] = function (url, options) {
|
||||
return axios(merge(options || {}, {
|
||||
return axios(utils.merge(options || {}, {
|
||||
method: method,
|
||||
url: url
|
||||
}));
|
||||
@@ -132,9 +131,9 @@ function createShortMethods() {
|
||||
}
|
||||
|
||||
function createShortMethodsWithData() {
|
||||
forEach(arguments, function (method) {
|
||||
utils.forEach(arguments, function (method) {
|
||||
axios[method] = function (url, data, options) {
|
||||
return axios(merge(options || {}, {
|
||||
return axios(utils.merge(options || {}, {
|
||||
method: method,
|
||||
url: url,
|
||||
data: data
|
||||
|
||||
Reference in New Issue
Block a user