github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 05:01:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Autolines were duplicating some text

Browse Source
This commit is contained in:
Robin Ward
2013-08-21 22:49:55 -04:00
parent a3757016d9
commit ae93fcebde
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/dialects/autolink_dialect.js
View File

@ -49,6 +49,7 @@ Discourse.Dialect.on("register", function(event) {
if (remaining && remaining.match(/\n/)) { if (remaining && remaining.match(/\n/)) {
next.unshift(MD.mk_block(remaining)); next.unshift(MD.mk_block(remaining));
remaining = [];
} }
} }

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

@ -62,6 +62,10 @@ test("Links", function() {
'<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a></p>', '<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a></p>',
"autolinks a URL"); "autolinks a URL");
cooked("EvilTrout: http://eviltrout.com hello",
'<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a> hello</p>',
"autolinks with trailing text");
cooked("here is [an example](http://twitter.com)", cooked("here is [an example](http://twitter.com)",
'<p>here is <a href="http://twitter.com">an example</a></p>', '<p>here is <a href="http://twitter.com">an example</a></p>',
"supports markdown style links"); "supports markdown style links");