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

Slight refactor/namings/comment on mergeConfig

Browse Source
This commit is contained in:
Martti Laine
2018-04-07 13:40:21 +02:00
parent b1c378606f
commit ff61caacb7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/mergeConfig.js
+5 -7
View File
@@ -4,7 +4,7 @@ var utils = require('../utils');
/** /**
* Config-specific merge-function which creates a new config-object * Config-specific merge-function which creates a new config-object
* based on given defaults and instance config. * by merging two configuration objects together.
* *
* @param {Object} config1 * @param {Object} config1
* @param {Object} config2 * @param {Object} config2
@@ -15,13 +15,11 @@ module.exports = function mergeConfig(config1, config2) {
config2 = config2 || {}; config2 = config2 || {};
var config = {}; var config = {};
utils.forEach(['url', 'method', 'params', 'data'], function valueFromInstanceConfig(prop) { utils.forEach(['url', 'method', 'params', 'data'], function valueFromConfig2(prop) {
if (typeof config2[prop] !== 'undefined') { config[prop] = config2[prop];
config[prop] = config2[prop];
}
}); });
utils.forEach(['headers', 'auth', 'proxy'], function mergeInstanceConfigWithDefaults(prop) { utils.forEach(['headers', 'auth', 'proxy'], function mergeValues(prop) {
if (typeof config2[prop] !== 'undefined') { if (typeof config2[prop] !== 'undefined') {
if (typeof config2[prop] === 'object') { if (typeof config2[prop] === 'object') {
config[prop] = utils.deepMerge(config1[prop], config2[prop]); config[prop] = utils.deepMerge(config1[prop], config2[prop]);
@@ -38,7 +36,7 @@ module.exports = function mergeConfig(config1, config2) {
'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName', 'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'maxContentLength', 'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'maxContentLength',
'validateStatus', 'maxRedirects', 'httpAgent', 'httpsAgent', 'cancelToken' 'validateStatus', 'maxRedirects', 'httpAgent', 'httpsAgent', 'cancelToken'
], function defaultToInstanceConfig(prop) { ], function defaultToConfig2(prop) {
config[prop] = typeof config2[prop] === 'undefined' ? config1[prop] : config2[prop]; config[prop] = typeof config2[prop] === 'undefined' ? config1[prop] : config2[prop];
}); });