Webpack build for branch master: 780a311c0a

This commit is contained in:
Travis CI 2018-01-04 00:23:12 +00:00
parent cf17872d69
commit 5f3385f9d2
2 changed files with 12 additions and 17 deletions

View file

@ -1355,15 +1355,10 @@ class Util {
*/ */
static parseEmoji(text) { static parseEmoji(text) {
if (text.includes('%')) text = decodeURIComponent(text); if (text.includes('%')) text = decodeURIComponent(text);
if (text.includes(':')) { if (!text.includes(':')) return { animated: false, name: text, id: null };
const m = text.match(/<?(a)?:(\w{2,32}):(\d{17,19})>?/); const m = text.match(/<?(a)?:(\w{2,32}):(\d{17,19})>?/);
if (!m) { if (!m) return null;
return null; return { animated: Boolean(m[1]), name: m[2], id: m[3] };
}
return { animated: Boolean(m[1]), name: m[2], id: m[3] };
} else {
return { animated: false, name: text, id: null };
}
} }
/** /**
@ -1462,11 +1457,11 @@ class Util {
* @private * @private
*/ */
static makePlainError(err) { static makePlainError(err) {
const obj = {}; return {
obj.name = err.name; name: err.name,
obj.message = err.message; message: err.message,
obj.stack = err.stack; stack: err.stack,
return obj; };
} }
/** /**
@ -1596,8 +1591,8 @@ class Util {
* @private * @private
*/ */
static basename(path, ext) { static basename(path, ext) {
let f = splitPathRe.exec(path).slice(1)[2]; let f = splitPathRe.exec(path)[3];
if (ext && f.substr(-1 * ext.length) === ext) f = f.substr(0, f.length - ext.length); if (ext && f.endsWith(ext)) f = f.slice(0, -ext.length);
return f; return f;
} }

File diff suppressed because one or more lines are too long