diff --git a/app/assets/javascripts/discourse/components/markdown.js b/app/assets/javascripts/discourse/components/markdown.js index e6373a934f5..57fb2e0dd43 100644 --- a/app/assets/javascripts/discourse/components/markdown.js +++ b/app/assets/javascripts/discourse/components/markdown.js @@ -100,7 +100,7 @@ Discourse.Markdown = { // Linebreaks var linebreaks = opts.traditional_markdown_linebreaks || Discourse.SiteSettings.traditional_markdown_linebreaks; if (!linebreaks) { - text = text.replace(/(^[\w<\[][^\n]*\n+)/gim, function(t) { + text = text.replace(/(^[\w<][^\n]*\n+)/gim, function(t) { if (t.match(/\n{2}/gim)) return t; return t.replace("\n", " \n"); }); diff --git a/test/javascripts/components/markdown_test.js b/test/javascripts/components/markdown_test.js index 021714cc1d2..e0840812ffc 100644 --- a/test/javascripts/components/markdown_test.js +++ b/test/javascripts/components/markdown_test.js @@ -20,7 +20,7 @@ test("basic cooking", function() { cooked("***hello***", "

hello

", "it can do bold and italics at once."); }); -test("Traditional Line Breaks", function() { +test("Line Breaks", function() { var input = "1\n2\n3"; cooked(input, "

1
2
3

", "automatically handles trivial newlines"); @@ -34,16 +34,9 @@ test("Traditional Line Breaks", function() { Discourse.SiteSettings.traditional_markdown_linebreaks = true; cooked(input, traditionalOutput, "It supports traditional markdown via a Site Setting"); + }); -test("Line Breaks", function() { - - cooked("[] first choice\n[] second choice", - "

[] first choice
[] second choice

", - "it handles new lines correctly with [] options"); -}); - - test("Links", function() { cooked("EvilTrout: http://eviltrout.com",