treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

trivial refactoring for emojify() (#5075) 

* unite loop process
* add hint for original emojifier
lolsob-rspec
MIYAGI Hikaru 2017-09-30 13:57:32 +00:00 committed by Eugen Rochko
parent a76120e437
commit 924c022340
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/javascript/mastodon/emoji.js
View File

@ -9,39 +9,38 @@ const emojify = (str, customEmojis = {}) => {
let rtn = ''; let rtn = '';
for (;;) { for (;;) {
let match, i = 0, tag; let match, i = 0, tag;
while (i < str.length && (tag = '<&'.indexOf(str[i])) === -1 && str[i] !== ':' && !(match = trie.search(str.slice(i)))) { while (i < str.length && (tag = '<&:'.indexOf(str[i])) === -1 && !(match = trie.search(str.slice(i)))) {
i += str.codePointAt(i) < 65536 ? 1 : 2; i += str.codePointAt(i) < 65536 ? 1 : 2;
} }
if (i === str.length) let rend, replacement = '';
if (i === str.length) {
break; break;
else if (tag >= 0) {
const tagend = str.indexOf('>;'[tag], i + 1) + 1;
if (!tagend)
break;
rtn += str.slice(0, tagend);
str = str.slice(tagend);
} else if (str[i] === ':') { } else if (str[i] === ':') {
try { if (!(() => {
// if replacing :shortname: succeed, exit this block with "continue" rend = str.indexOf(':', i + 1) + 1;
const closeColon = str.indexOf(':', i + 1) + 1; if (!rend) return false; // no pair of ':'
if (!closeColon) throw null; // no pair of ':'
const lt = str.indexOf('<', i + 1); const lt = str.indexOf('<', i + 1);
if (!(lt === -1 || lt >= closeColon)) throw null; // tag appeared before closing ':' if (!(lt === -1 || lt >= rend)) return false; // tag appeared before closing ':'
const shortname = str.slice(i, closeColon); const shortname = str.slice(i, rend);
// now got a replacee as ':shortname:'
// if you want additional emoji handler, add statements below which set replacement and return true.
if (shortname in customEmojis) { if (shortname in customEmojis) {
rtn += str.slice(0, i) + `<img draggable="false" class="emojione" alt="${shortname}" title="${shortname}" src="${customEmojis[shortname]}" />`; replacement = `<img draggable="false" class="emojione" alt="${shortname}" title="${shortname}" src="${customEmojis[shortname]}" />`;
str = str.slice(closeColon); return true;
continue;
} }
} catch (e) {} return false;
// replacing :shortname: failed })()) rend = ++i;
rtn += str.slice(0, i + 1); } else if (tag >= 0) { // <, &
str = str.slice(i + 1); rend = str.indexOf('>;'[tag], i + 1) + 1;
} else { if (!rend) break;
i = rend;
} else { // matched to unicode emoji
const [filename, shortCode] = unicodeMapping[match]; const [filename, shortCode] = unicodeMapping[match];
rtn += str.slice(0, i) + `<img draggable="false" class="emojione" alt="${match}" title=":${shortCode}:" src="${assetHost}/emoji/${filename}.svg" />`; replacement = `<img draggable="false" class="emojione" alt="${match}" title=":${shortCode}:" src="${assetHost}/emoji/${filename}.svg" />`;
str = str.slice(i + match.length); rend = i + match.length;
} }
rtn += str.slice(0, i) + replacement;
str = str.slice(rend);
} }
return rtn + str; return rtn + str;
}; };