mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-11 09:03:29 +01:00
ESLint stuff...
This commit is contained in:
@@ -1,19 +1,17 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = function merge(def, given) {
|
||||
if (!given) {
|
||||
return def;
|
||||
}
|
||||
if (!given) {
|
||||
return def;
|
||||
}
|
||||
|
||||
given = given || {};
|
||||
given = given || {};
|
||||
|
||||
for (var key in def) {
|
||||
if (!given.hasOwnProperty(key)) {
|
||||
given[key] = def[key];
|
||||
} else if (given[key] === Object(given[key])) {
|
||||
given[key] = merge(def[key], given[key]);
|
||||
}
|
||||
}
|
||||
for (const key in def) {
|
||||
if (!{}.hasOwnProperty.call(given, key)) {
|
||||
given[key] = def[key];
|
||||
} else if (given[key] === Object(given[key])) {
|
||||
given[key] = merge(def[key], given[key]);
|
||||
}
|
||||
}
|
||||
|
||||
return given;
|
||||
return given;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user