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

update upstream to 4.0.1 #1

Merged
oat merged 12 commits from :main into main 2022-11-14 22:56:10 +01:00
Conversation 0 Commits 12 Files Changed 11 +11 -4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8aa56aedfd - Show all commits

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

@ -19,10 +19,13 @@ const emojiFilename = (filename) => {
return borderedEmoji.includes(filename) ? (filename + '_border') : filename;
};
const domParser = new DOMParser();
const emojifyTextNode = (node, customEmojis) => {
const parentElement = node.parentElement;
let str = node.textContent;
const fragment = new DocumentFragment();
for (;;) {
let match, i = 0;
@ -64,12 +67,16 @@ const emojifyTextNode = (node, customEmojis) => {
}
}
fragment.append(document.createTextNode(str.slice(0, i)));
if (replacement) {
fragment.append(domParser.parseFromString(replacement, 'text/html').documentElement.getElementsByTagName('img')[0]);
}
node.textContent = str.slice(0, i);
parentElement.insertAdjacentHTML('beforeend', replacement);
str = str.slice(rend);
node = document.createTextNode(str);
parentElement.append(node);
}
fragment.append(document.createTextNode(str));
node.parentElement.replaceChild(fragment, node);
};
const emojifyNode = (node, customEmojis) => {