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

Revert "Revert "FIX: Markdown bug", breaks build" 

This reverts commit 08ad5d479e.
This commit is contained in:
Robin Ward 2013-11-20 11:53:06 -05:00
parent f3feb441f9
commit 0bab3f9b4e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,10 @@ test("Traditional Line Breaks", function() {
cooked(input, traditionalOutput, "It supports traditional markdown via a Site Setting");
});
test("Unbalanced underscores", function() {
cooked("[evil_trout][1] hello_\n\n[1]: http://eviltrout.com", "<p><a href=\"http://eviltrout.com\">evil_trout</a> hello_</p>");
});
test("Line Breaks", function() {
cooked("[] first choice\n[] second choice",
"<p>[] first choice<br/>[] second choice</p>",

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

@ -643,7 +643,8 @@
var DialectHelpers = {};
DialectHelpers.inline_until_char = function( text, want ) {
var consumed = 0,
nodes = [];
nodes = [],
patterns = this.dialect.inline.__patterns__.replace('|_|', '');
while ( true ) {
if ( text.charAt( consumed ) === want ) {
@ -657,7 +658,7 @@
return null;
}
var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ) );
var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ), patterns );
consumed += res[ 0 ];
// Add any returned nodes.
nodes.push.apply( nodes, res.slice( 1 ) );