StarMirror/showdown
1
0
Fork 0
mirror of https://github.com/showdownjs/showdown.git synced 2024-03-22 13:30:55 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into syntax-extensions

Browse Source
This commit is contained in:
Titus 2012-08-09 20:19:17 -06:00
commit 0e4c052373
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@ -15,12 +15,16 @@
],
"repository": {
"type": "git",
"url": "https://github.com/coreyti/showdown.git"
"url": "https://github.com/coreyti/showdown.git",
"web": "https://github.com/coreyti/showdown"
},
"devDependencies": {
"mocha": "*",
"should": "*"
},
"licenses": [{ "type": "BSD" }],
"licenses": [{
"type": "BSD",
"url": "https://github.com/coreyti/showdown/raw/master/license.txt"
}],
"main": "./src/showdown"
}

2
src/showdown.js
View File

@ -585,7 +585,7 @@ var _DoAnchors = function(text) {
)
/g,writeAnchorTag);
*/
text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()<?(.*?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,writeAnchorTag);
text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()<?(.*?(?:\(.*?\).*?)?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,writeAnchorTag);
//
// Last, handle reference-style shortcuts: [link text]

2
test/cases/url-with-parenthesis.html Normal file
View File

@ -0,0 +1,2 @@
<p>There's an <a href="http://en.memory-alpha.org/wiki/Darmok_(episode)">episode</a> of Star Trek: The Next Generation</p>

2
test/cases/url-with-parenthesis.md Normal file
View File

@ -0,0 +1,2 @@
There's an [episode](http://en.memory-alpha.org/wiki/Darmok_(episode)) of Star Trek: The Next Generation