github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 09:41:49 +08:00
Code Issues Actions 46 Packages Projects Releases Wiki Activity

Deduplicate emojis even after using multiple matchers

Browse Source 
Fixes flarum/core#968.
This commit is contained in:
Franz Liedke 2016-05-28 16:22:31 +09:00
parent dbf82e4641
commit 16f3a09856
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/emoji/js/forum/dist/extension.js vendored
View File

@ -235,7 +235,8 @@ System.register('flarum/emoji/addComposerAutocomplete', ['flarum/extend', 'flaru
var findMatchingEmojis = function findMatchingEmojis(matcher) {
for (var _i = 0; _i < emojiKeys.length && maxSuggestions > 0; _i++) {
if (matcher(emojiKeys[_i])) {
var curEmoji = emojiKeys[_i];
if (matcher(curEmoji) && similarEmoji.indexOf(curEmoji) === -1) {
--maxSuggestions;
similarEmoji.push(emojiKeys[_i]);
}

3
extensions/emoji/js/forum/src/addComposerAutocomplete.js
View File

@ -106,7 +106,8 @@ export default function addComposerAutocomplete() {
const findMatchingEmojis = matcher => {
for (let i = 0; i < emojiKeys.length && maxSuggestions > 0; i++) {
if (matcher(emojiKeys[i])) {
const curEmoji = emojiKeys[i];
if (matcher(curEmoji) && similarEmoji.indexOf(curEmoji) === -1) {
--maxSuggestions;
similarEmoji.push(emojiKeys[i]);
}