dark-firepit
/
mastodon
Archived
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge upstream #2

Merged
oat merged 33 commits from :main into main 2022-11-17 00:39:52 +01:00
Conversation 0 Commits 33 Files Changed 77 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ceafd1f68f - Show all commits

4
app/javascript/flavours/glitch/features/emoji/emoji.js
View File

@ -30,11 +30,11 @@ const emojifyTextNode = (node, customEmojis) => {
let match, i = 0;
if (customEmojis === null) {
while (i < str.length && !(match = trie.search(str.slice(i)))) {
while (i < str.length && (useSystemEmojiFont || !(match = trie.search(str.slice(i))))) {
i += str.codePointAt(i) < 65536 ? 1 : 2;
}
} else {
while (i < str.length && str[i] !== ':' && !(match = trie.search(str.slice(i)))) {
while (i < str.length && str[i] !== ':' && (useSystemEmojiFont || !(match = trie.search(str.slice(i))))) {
i += str.codePointAt(i) < 65536 ? 1 : 2;
}
}