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

FIX: custom emojis leaking over multisite - take 2

Browse Source
This commit is contained in:
Régis Hanol
2016-11-17 23:28:27 +01:00
parent ed1720cd02
commit 2710525d01
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ export function performEmojiUnescape(string, opts) {
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) ? "emoji emoji-custom" : "emoji";
const classes = isCustomEmoji(emojiVal, opts) ? "emoji emoji-custom" : "emoji";
return url && (isEmoticon || hasEndingColon) ?
`<img src='${url}' title='${emojiVal}' alt='${emojiVal}' class='${classes}'>` : m;
@@ -45,8 +45,11 @@ export function performEmojiUnescape(string, opts) {
return string;
}
export function isCustomEmoji(code) {
return extendedEmoji.hasOwnProperty(code.toLowerCase());
export function isCustomEmoji(code, opts) {
code = code.toLowerCase();
if (extendedEmoji.hasOwnProperty(code)) return true;
if (opts && opts.customEmoji && opts.customEmoji.hasOwnProperty(code)) return true;
return false;
}
export function buildEmojiUrl(code, opts) {