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

FIX: keep emoji syntax for custom emojis in quotes (#6488)

Browse Source
This commit is contained in:
Maja Komel 2018-10-15 04:57:15 +02:00 committed by Guo Xiang Tan
parent d408073fc2
commit 57b52cd1de
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/lib/to-markdown.js.es6
View File

@ -227,7 +227,7 @@ export class Tag {
const src = attr.src || pAttr.src;
const cssClass = attr.class || pAttr.class;
if (cssClass === "emoji") {
if (cssClass && cssClass.includes("emoji")) {
return attr.title || pAttr.title;
}

12
test/javascripts/lib/to-markdown-test.js.es6
View File

@ -340,3 +340,15 @@ QUnit.test("keeps emoji and removes click count", assert => {
assert.equal(toMarkdown(html), markdown);
});
QUnit.test("keeps emoji syntax for custom emoji", assert => {
const html = `
<p>
<img class="emoji emoji-custom" title=":custom_emoji:" src="https://d11a6trkgmumsb.cloudfront.net/images/emoji/custom_emoji" alt=":custom_emoji:" />
</p>
`;
const markdown = `:custom_emoji:`;
assert.equal(toMarkdown(html), markdown);
});