IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Remove _.union

Browse Source
This commit is contained in:
Robin Ward 2020-09-01 14:45:44 -04:00
parent e60d06d880
commit 0b098566ff
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/lib/uploads.js
View File

@ -140,7 +140,7 @@ function imagesExtensions(staff, siteSettings) {
const staffExts = staffExtensions(siteSettings).filter(ext => const staffExts = staffExtensions(siteSettings).filter(ext =>
IMAGES_EXTENSIONS_REGEX.test(ext) IMAGES_EXTENSIONS_REGEX.test(ext)
); );
exts = _.union(exts, staffExts); exts = exts.concat(staffExts);
} }
return exts; return exts;
} }

6
app/assets/javascripts/pretty-text/addon/emoji.js
View File

@ -215,7 +215,11 @@ export function emojiSearch(term, options) {
toSearch = toSearch =
toSearch || toSearch ||
_.union(_.keys(emojiHash), _.keys(extendedEmoji), _.keys(aliasHash)).sort(); [
...Object.keys(emojiHash),
...Object.keys(extendedEmoji),
...Object.keys(aliasHash)
].sort();
const results = []; const results = [];