2
0
mirror of https://github.com/tenrok/axios.git synced 2026-06-14 18:42:33 +03:00

Fixing config weirdness

This commit is contained in:
Matt Zabriskie
2015-12-24 11:44:46 -07:00
parent cdedbf0bb1
commit 82847f737e
6 changed files with 176 additions and 49 deletions
+5 -1
View File
@@ -212,7 +212,11 @@ function forEach(obj, fn) {
function merge(/* obj1, obj2, obj3, ... */) {
var result = {};
function assignValue(val, key) {
result[key] = val;
if (typeof result[key] === 'object' && typeof val === 'object') {
result[key] = merge(result[key], val);
} else {
result[key] = val;
}
}
for (var i = 0, l = arguments.length; i < l; i++) {