mirror of
https://github.com/tenrok/axios.git
synced 2026-06-23 20:40:40 +03:00
Use deepMerge in deepMerge
This commit is contained in:
+2
-2
@@ -272,9 +272,9 @@ function deepMerge(/* obj1, obj2, obj3, ... */) {
|
|||||||
var result = {};
|
var result = {};
|
||||||
function assignValue(val, key) {
|
function assignValue(val, key) {
|
||||||
if (typeof result[key] === 'object' && typeof val === 'object') {
|
if (typeof result[key] === 'object' && typeof val === 'object') {
|
||||||
result[key] = merge(result[key], val);
|
result[key] = deepMerge(result[key], val);
|
||||||
} else if (typeof val === 'object') {
|
} else if (typeof val === 'object') {
|
||||||
result[key] = merge({}, val);
|
result[key] = deepMerge({}, val);
|
||||||
} else {
|
} else {
|
||||||
result[key] = val;
|
result[key] = val;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user