Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: filtered emojis now correctly include custom emojis

This commit is contained in:
Joffrey JAFFEUX 2017-07-21 19:46:40 +02:00
parent e36d9f55c3
commit d5f53da43f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/emoji-picker.js.es6
View File

@ -188,7 +188,7 @@ export default Ember.Component.extend({
$list.show(); $list.show();
} else { } else {
const regexp = new RegExp(this.get("filter"), "g"); const regexp = new RegExp(this.get("filter"), "g");
const filteredCodes = _.filter(emojis, code => regexp.test(code)).slice(0, 30); const filteredCodes = _.filter(emojis.concat(_.keys(extendedEmojiList())), code => regexp.test(code)).slice(0, 30);
$results.empty().html( $results.empty().html(
_.map(filteredCodes, (code) => { _.map(filteredCodes, (code) => {
const hasDiversity = isSkinTonableEmoji(code); const hasDiversity = isSkinTonableEmoji(code);