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

Merge pull request #851 from ZogStriP/fix-user-mention-when-there-are-multiple-code-blocks 

FIX: @username mentions when there are multiple code blocks in a post.
This commit is contained in:
Sam 2013-05-15 17:37:56 -07:00
parent 0a56f64cee 27dfb7a948
commit 1201ba9920
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/components/markdown.js
View File

@ -143,8 +143,8 @@ Discourse.Markdown = {
if (!text) return "";
// don't do @username mentions inside <pre> or <code> blocks
text = text.replace(/<(pre|code)>([\s\S]*?@[\s\S]*?)<\/(pre|code)>/gi, function(wholeMatch, m1, m2, m3) {
return "<" + m1 + ">" + (m2.replace(/@/g, '&#64;')) + "</" + m3 + ">";
text = text.replace(/<(pre|code)>([\s\S](?!<(pre|code)>))*?@([\s\S](?!<(pre|code)>))*?<\/(pre|code)>/gi, function(m) {
return m.replace(/@/g, '&#64;');
});
// add @username mentions, if valid; must be bounded on left and right by non-word characters

8
spec/javascripts/components/markdown_spec.js
View File

@ -92,6 +92,14 @@ describe("Discourse.Markdown", function() {
expect(cook("@EvilTrout yo")).toBe("<p><span class='mention'>@EvilTrout</span> yo</p>");
});
it("doesn't do @username mentions inside <pre> or <code> blocks", function() {
expect(cook("`@EvilTrout yo`")).toBe("<p><code>&#64;EvilTrout yo</code></p>");
});
it("deals correctly with multiple <code> blocks", function() {
expect(cook("`evil` @EvilTrout `trout`")).toBe("<p><code>evil</code> <span class='mention'>@EvilTrout</span> <code>trout</code></p>");
});
});
describe("Oneboxing", function() {