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: Don't convert :) into Emoji when emojis or emoji shurtcuts are disabled

Browse Source
This commit is contained in:
Gerhard Schlager
2019-05-21 16:56:51 +02:00
parent e8799f0ba4
commit e224100023
8 changed files with 146 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
View File

@@ -119,7 +119,8 @@ const rule = {
if (options.enableEmoji) {
title = performEmojiUnescape(topicInfo.title, {
getURL: options.getURL,
emojiSet: options.emojiSet
emojiSet: options.emojiSet,
enableEmojiShortcuts: options.enableEmojiShortcuts
});
}
@@ -154,6 +155,7 @@ export function setup(helper) {
helper.registerOptions((opts, siteSettings) => {
opts.enableEmoji = siteSettings.enable_emoji;
opts.emojiSet = siteSettings.emoji_set;
opts.enableEmojiShortcuts = siteSettings.enable_emoji_shortcuts;
});
helper.registerPlugin(md => {