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

FIX: emoji-picker filtering false positive

This commit is contained in:
Joffrey JAFFEUX 2017-07-21 20:42:30 +02:00
parent 6d09fbde44
commit cdefb58018
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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