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

FIX: auto-quote should not trigger when the first " is preceded by bbcode-like garbage.

This commit is contained in:
Jens Maier 2014-07-27 15:57:40 +02:00
parent b19ad15086
commit 9124cf0eaf
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/javascripts/lib/markdown_test.js
View File

@ -36,6 +36,7 @@ test("Auto quoting", function() {
"it converts single line quotes to blockquotes"); "it converts single line quotes to blockquotes");
cooked('"hello\nworld"', "<p>\"hello<br/>world\"</p>", "It doesn't convert multi line quotes"); cooked('"hello\nworld"', "<p>\"hello<br/>world\"</p>", "It doesn't convert multi line quotes");
cooked('"hello "evil" trout"', '<p>"hello "evil" trout"</p>', "it doesn't format quotes in the middle of a line"); cooked('"hello "evil" trout"', '<p>"hello "evil" trout"</p>', "it doesn't format quotes in the middle of a line");
cooked('["text"', '<p>["text"</p>', "it recognizes leading tag-like text");
}); });
test("Traditional Line Breaks", function() { test("Traditional Line Breaks", function() {

2
vendor/assets/javascripts/better_markdown.js vendored
View File

@ -662,7 +662,7 @@
return [consumed, null, nodes]; return [consumed, null, nodes];
} }
var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ), patterns ); var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ), patterns, [text.substr(0, consumed)]);
consumed += res[ 0 ]; consumed += res[ 0 ];
// Add any returned nodes. // Add any returned nodes.
nodes.push.apply( nodes, res.slice( 1 ) ); nodes.push.apply( nodes, res.slice( 1 ) );