|
@ -123,7 +123,7 @@ exports.fillIfDefined = function (a, b, allowDeletion = false) { |
|
|
if (b[prop] !== undefined) { |
|
|
if (b[prop] !== undefined) { |
|
|
if (typeof b[prop] !== 'object') { |
|
|
if (typeof b[prop] !== 'object') { |
|
|
if ((b[prop] === undefined || b[prop] === null) && a[prop] !== undefined && allowDeletion === true) { |
|
|
if ((b[prop] === undefined || b[prop] === null) && a[prop] !== undefined && allowDeletion === true) { |
|
|
a[prop] = b[prop]; |
|
|
|
|
|
|
|
|
delete a[prop]; |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
a[prop] = b[prop]; |
|
|
a[prop] = b[prop]; |
|
@ -218,7 +218,7 @@ exports.selectiveDeepExtend = function (props, a, b, allowDeletion = false) { |
|
|
a[prop] = {}; |
|
|
a[prop] = {}; |
|
|
} |
|
|
} |
|
|
if (a[prop].constructor === Object) { |
|
|
if (a[prop].constructor === Object) { |
|
|
exports.deepExtend(a[prop], b[prop]); |
|
|
|
|
|
|
|
|
exports.deepExtend(a[prop], b[prop], false, allowDeletion); |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
if ((b[prop] === undefined || b[prop] === null) && a[prop] !== undefined && allowDeletion === true) { |
|
|
if ((b[prop] === undefined || b[prop] === null) && a[prop] !== undefined && allowDeletion === true) { |
|
|