dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-06-19 14:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Webpack build for branch master: f8a1f2c23b

Browse source
This commit is contained in:
Travis CI 2017-07-04 02:00:34 +00:00
parent 10daef809d
commit 8ab47bc1dc
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
discord.master.js
View file

@ -1175,6 +1175,7 @@ module.exports = Collection;
const Constants = __webpack_require__(0);
const ConstantsHttp = Constants.DefaultOptions.http;
const { RangeError, TypeError } = __webpack_require__(5);
const has = (o, k) => Object.prototype.hasOwnProperty.call(o, k);
/**
* Contains various general-purpose utility methods. These functions are also available on the base `Discord` object.
@ -1301,7 +1302,7 @@ class Util {
static mergeDefault(def, given) {
if (!given) return def;
for (const key in def) {
if (!{}.hasOwnProperty.call(given, key) && def[key] !== undefined) {
if (!has(given, key) || given[key] === undefined) {
given[key] = def[key];
} else if (given[key] === Object(given[key])) {
given[key] = this.mergeDefault(def[key], given[key]);

2
discord.master.min.js vendored
View file

File diff suppressed because one or more lines are too long