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

Revert "UX: Better emoji escaping for topic title (#7176)" (#7201)

Browse Source 
This reverts commit 0d9bc0aaa6.
This commit is contained in:
Régis Hanol
2019-03-19 12:02:47 +01:00
committed by GitHub
parent 31e06dbcd2
commit 6fb49e74a1
7 changed files with 25 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,8 +3,7 @@ import {
aliases,
searchAliases,
translations,
tonableEmojis,
replacements
tonableEmojis
} from "pretty-text/emoji/data";
import { IMAGE_VERSION } from "pretty-text/emoji/version";
@@ -35,48 +34,25 @@ export function performEmojiUnescape(string, opts) {
return;
}
return string.replace(/[\u1000-\uFFFF]+|\B:[^\s:]+(?::t\d)?:?\B/g, m => {
const isEmoticon = !!translations[m];
const isUnicodeEmoticon = !!replacements[m];
let emojiVal;
if (isEmoticon) {
emojiVal = translations[m];
} else if (isUnicodeEmoticon) {
emojiVal = replacements[m];
} else {
emojiVal = m.slice(1, m.length - 1);
}
const hasEndingColon = m.lastIndexOf(":") === m.length - 1;
const url = buildEmojiUrl(emojiVal, opts);
const classes = isCustomEmoji(emojiVal, opts)
? "emoji emoji-custom"
: "emoji";
// this can be further improved by supporting matches of emoticons that don't begin with a colon
if (string.indexOf(":") >= 0) {
return string.replace(/\B:[^\s:]+(?::t\d)?:?\B/g, m => {
const isEmoticon = !!translations[m];
const emojiVal = isEmoticon ? translations[m] : m.slice(1, m.length - 1);
const hasEndingColon = m.lastIndexOf(":") === m.length - 1;
const url = buildEmojiUrl(emojiVal, opts);
const classes = isCustomEmoji(emojiVal, opts)
? "emoji emoji-custom"
: "emoji";
return url && (isEmoticon || hasEndingColon || isUnicodeEmoticon)
? `<img src='${url}' ${
opts.skipTitle ? "" : `title='${emojiVal}'`
} alt='${emojiVal}' class='${classes}'>`
: m;
});
return string;
}
export function performEmojiEscape(string) {
if (!string) {
return;
return url && (isEmoticon || hasEndingColon)
? `<img src='${url}' ${
opts.skipTitle ? "" : `title='${emojiVal}'`
} alt='${emojiVal}' class='${classes}'>`
: m;
});
}
return string.replace(/[\u1000-\uFFFF]+|\B:[^\s:]+(?::t\d)?:?\B/g, m => {
if (!!translations[m]) {
return ":" + translations[m] + ":";
} else if (!!replacements[m]) {
return ":" + replacements[m] + ":";
} else {
return m;
}
});
return string;
}

1
app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
View File

@@ -3,4 +3,3 @@ export const tonableEmojis = <%= Emoji.tonable_emojis.flatten.inspect %>;
export const aliases = <%= Emoji.aliases.inspect.gsub("=>", ":") %>;
export const searchAliases = <%= Emoji.search_aliases.inspect.gsub("=>", ":") %>;
export const translations = <%= Emoji.translations.inspect.gsub("=>", ":") %>;
export const replacements = <%= Emoji.unicode_replacements_json %>;