Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow option to not include title on emoji images.

This commit is contained in:
Guo Xiang Tan 2017-01-03 11:07:55 +08:00
parent ecb1078343
commit 1cf0401e26
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/text.js.es6
View File

@ -29,8 +29,8 @@ function emojiOptions() {
return { getURL: Discourse.getURLWithCDN, emojiSet: siteSettings.emoji_set }; return { getURL: Discourse.getURLWithCDN, emojiSet: siteSettings.emoji_set };
} }
export function emojiUnescape(string) { export function emojiUnescape(string, options) {
const opts = emojiOptions(); const opts = _.extend(emojiOptions(), options || {});
return opts ? performEmojiUnescape(string, opts) : string; return opts ? performEmojiUnescape(string, opts) : string;
} }

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

@ -38,7 +38,7 @@ export function performEmojiUnescape(string, opts) {
const classes = isCustomEmoji(emojiVal, opts) ? "emoji emoji-custom" : "emoji"; const classes = isCustomEmoji(emojiVal, opts) ? "emoji emoji-custom" : "emoji";
return url && (isEmoticon || hasEndingColon) ? return url && (isEmoticon || hasEndingColon) ?
`<img src='${url}' title='${emojiVal}' alt='${emojiVal}' class='${classes}'>` : m; `<img src='${url}' ${opts.skipTitle ? '' : `title='${emojiVal}'`} alt='${emojiVal}' class='${classes}'>` : m;
}); });
} }