codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Don't autolink within a markdown link.

Browse source
This commit is contained in:
Robin Ward 2013-11-04 14:24:40 -05:00
parent cc47ade2ed
commit b8e63719f8
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/discourse/dialects/autolink_dialect.js
View file

@ -10,6 +10,10 @@ var urlReplacerArgs = {
var url = matches[1], var url = matches[1],
displayUrl = url; displayUrl = url;
// Don't autolink a markdown link to something
if (url.match(/\]\[\d$/)) { return; }
// If we improperly caught a markdown link abort // If we improperly caught a markdown link abort
if (url.match(/\(http/)) { return; } if (url.match(/\(http/)) { return; }

6
test/javascripts/lib/markdown_test.js
View file

@ -261,6 +261,12 @@ test("Oneboxing", function() {
}); });
test("links with full urls", function() {
cooked("[http://eviltrout.com][1] is a url\n\n[1]: http://eviltrout.com",
"<p><a href=\"http://eviltrout.com\">http://eviltrout.com</a> is a url</p>",
"it supports links that are full URLs");
});
test("Code Blocks", function() { test("Code Blocks", function() {
cooked("```\na\nb\nc\n\nd\n```", cooked("```\na\nb\nc\n\nd\n```",