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

fix the build

This commit is contained in:
Régis Hanol 2014-03-27 16:57:46 +01:00
parent e663d78104
commit 5edec22e28
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/markdown.js
View File

@ -134,6 +134,10 @@ Discourse.Markdown = {
if(/^(https?:)?\/\/[\w\.\-]+/i.test(url)) { return url; } if(/^(https?:)?\/\/[\w\.\-]+/i.test(url)) { return url; }
// relative urls // relative urls
if(/^\/[\w\.\-]+/i.test(url)) { return url; } if(/^\/[\w\.\-]+/i.test(url)) { return url; }
// anchors
if(/^#[\w\.\-]+/i.test(url)) { return url; }
// mailtos
if(/^mailto:[\w\.\-@]+/i.test(url)) { return url; }
}, },
/** /**

2
test/javascripts/mdtest/fixtures/Links, reference style.text
View File

@ -56,7 +56,7 @@ In this case, [this](/somethingelse/) points to something else.
Backslashing should suppress \[this] and [this\]. Backslashing should suppress \[this] and [this\].
[this]: foo [this]: #foo
* * * * * *

14
test/javascripts/mdtest/fixtures/Links, reference style.xhtml
View File

@ -19,15 +19,15 @@
<hr /> <hr />
<p><a href="foo">this</a> should work</p> <p><a href="#foo">this</a> should work</p>
<p>So should <a href="foo">this</a>.</p> <p>So should <a href="#foo">this</a>.</p>
<p>And <a href="foo">this</a>.</p> <p>And <a href="#foo">this</a>.</p>
<p>And <a href="foo">this</a>.</p> <p>And <a href="#foo">this</a>.</p>
<p>And <a href="foo">this</a>.</p> <p>And <a href="#foo">this</a>.</p>
<p>But not [that] [].</p> <p>But not [that] [].</p>
@ -35,9 +35,9 @@
<p>Nor [that].</p> <p>Nor [that].</p>
<p>[Something in brackets like <a href="foo">this</a> should work]</p> <p>[Something in brackets like <a href="#foo">this</a> should work]</p>
<p>[Same with <a href="foo">this</a>.]</p> <p>[Same with <a href="#foo">this</a>.]</p>
<p>In this case, <a href="/somethingelse/">this</a> points to something else.</p> <p>In this case, <a href="/somethingelse/">this</a> points to something else.</p>