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

FIX: New line insertion when a line begins with []

This commit is contained in:
Robin Ward 2013-08-26 11:42:52 -04:00
parent 982b763216
commit f84630a54d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@ Discourse.Markdown = {
// Linebreaks // Linebreaks
var linebreaks = opts.traditional_markdown_linebreaks || Discourse.SiteSettings.traditional_markdown_linebreaks; var linebreaks = opts.traditional_markdown_linebreaks || Discourse.SiteSettings.traditional_markdown_linebreaks;
if (!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; if (t.match(/\n{2}/gim)) return t;
return t.replace("\n", " \n"); return t.replace("\n", " \n");
}); });

11
test/javascripts/components/markdown_test.js
View File

@ -20,7 +20,7 @@ test("basic cooking", function() {
cooked("***hello***", "<p><strong><em>hello</em></strong></p>", "it can do bold and italics at once."); cooked("***hello***", "<p><strong><em>hello</em></strong></p>", "it can do bold and italics at once.");
}); });
test("Line Breaks", function() { test("Traditional Line Breaks", function() {
var input = "1\n2\n3"; var input = "1\n2\n3";
cooked(input, "<p>1<br>2<br>3</p>", "automatically handles trivial newlines"); cooked(input, "<p>1<br>2<br>3</p>", "automatically handles trivial newlines");
@ -34,9 +34,16 @@ test("Line Breaks", function() {
Discourse.SiteSettings.traditional_markdown_linebreaks = true; Discourse.SiteSettings.traditional_markdown_linebreaks = true;
cooked(input, traditionalOutput, "It supports traditional markdown via a Site Setting"); cooked(input, traditionalOutput, "It supports traditional markdown via a Site Setting");
}); });
test("Line Breaks", function() {
cooked("[] first choice\n[] second choice",
"<p>[] first choice<br>[] second choice</p>",
"it handles new lines correctly with [] options");
});
test("Links", function() { test("Links", function() {
cooked("EvilTrout: http://eviltrout.com", cooked("EvilTrout: http://eviltrout.com",