projects
/
blerg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.7
[blerg.git]
/
www
/
jssrc
/
blerg
/
Util.js
diff --git
a/www/jssrc/blerg/Util.js
b/www/jssrc/blerg/Util.js
index
78081ed
..
51489c9
100644
(file)
--- a/
www/jssrc/blerg/Util.js
+++ b/
www/jssrc/blerg/Util.js
@@
-16,7
+16,7
@@
blerg.Util.formatLinkHooks = [
];
blerg.Util.formatMarkdownLinks = function(l) {
];
blerg.Util.formatMarkdownLinks = function(l) {
- m = l.match(/(\s|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)"]*?)?)(\s([^)]*))?\)/);
+ m = l.match(/(\s
[()\[\]{}]?
|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)"]*?)?)(\s([^)]*))?\)/);
if (!m)
return l;
var whitespace = m[1];
if (!m)
return l;
var whitespace = m[1];
@@
-72,7
+72,7
@@
blerg.Util.blergFormat = function(text) {
l = l.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
// Turn HTTP URLs into links
l = l.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
// Turn HTTP URLs into links
- l = l.replace(/(\s|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/([^\s"]*[^.!,;?()\s])?)?)/g, '$1<a href="$2">$2</a>');
+ l = l.replace(/(\s
[()\[\]{}]?
|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/([^\s"]*[^.!,;?()\s])?)?)/g, '$1<a href="$2">$2</a>');
// Turn markdown links into links
l = blerg.Util.formatMarkdownLinks(l);
// Turn markdown links into links
l = blerg.Util.formatMarkdownLinks(l);