commit:839ecb35df4dba3ab86bfa45cc8135c59a58fcce
author:Chip Black
committer:Chip Black
date:Wed Mar 2 15:06:49 2011 -0800
parents:7c28f5b05e6c67858a46795e42d41b9ac1aa7716
(maybe) fix escaped metachars
diff --git a/www/js/blerg.js b/www/js/blerg.js
line changes: +5/-2
index 21d7d34..3c4cc0e
--- a/www/js/blerg.js
+++ b/www/js/blerg.js
@@ -341,8 +341,11 @@ function mangleRecord(record, template) {
         l = l.replace(/(\s|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)"]*?)?)\)/g, '$1<a href="$3">$2</a>');
 
         // Turn *foo* into italics and **foo** into bold
-        l = l.replace(/(\W|^)\*\*(\w[^*]*)\*\*(\W|$)/g, '$1<b>$2</b>$3');
-        l = l.replace(/(\W|^)\*(\w[^*]*)\*(\W|$)/g, '$1<i>$2</i>$3');
+        l = l.replace(/([^\w\\]|^)\*\*(\w[^*]*)\*\*(\W|$)/g, '$1<b>$2</b>$3');
+        l = l.replace(/([^\w\\]|^)\*(\w[^*]*)\*(\W|$)/g, '$1<i>$2</i>$3');
+
+        // Remove backslashes from escaped metachars
+        l = l.replace(/\\([*\[\]])/g, '$1');
 
         // Turn refs and tags into links
         l = l.replace(/(\s|^)#([A-Za-z0-9_-]+)/g, '$1<a href="#/tag/$2" class="ref" onclick="return qlink()">#$2</a>');