IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Unified emoji escape regex

Browse Source
This commit is contained in:
Tim Lange
2019-03-28 22:31:27 +01:00
committed by Robin Ward
parent 31053f30de
commit 2c4b3c21a9
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/pretty-text/emoji.js.es6
View File

@@ -21,6 +21,14 @@ export function extendedEmojiList() {
const emojiHash = {};
const unicodeRegexp = new RegExp(
Object.keys(replacements)
.sort()
.reverse()
.join("|") + "|\\B:[^\\s:]+(?::t\\d)?:?\\B",
"g"
);
// add all default emojis
emojis.forEach(code => (emojiHash[code] = true));
@@ -35,7 +43,7 @@ export function performEmojiUnescape(string, opts) {
return;
}
return string.replace(/[\u1000-\uFFFF]+|\B:[^\s:]+(?::t\d)?:?\B/g, m => {
return string.replace(unicodeRegexp, m => {
const isEmoticon = !!translations[m];
const isUnicodeEmoticon = !!replacements[m];
let emojiVal;
@@ -63,7 +71,7 @@ export function performEmojiUnescape(string, opts) {
}
export function performEmojiEscape(string) {
return string.replace(/[\u1000-\uFFFF]+|\B:[^\s:]+(?::t\d)?:?\B/g, m => {
return string.replace(unicodeRegexp, m => {
if (!!translations[m]) {
return ":" + translations[m] + ":";
} else if (!!replacements[m]) {