diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-08-11 22:51:47 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-08-12 11:19:42 -0700 |
| commit | 5a58fc41c2ab1c3995ff8c63f7226254bec0ff10 (patch) | |
| tree | 18dd4b1f2a7e6138d5b5df1b1b42aaa8f837fb27 | |
| parent | e02883baf2fd2a0cfc21bd557bc0ecc69afd707c (diff) | |
| download | chat-5a58fc41c2ab1c3995ff8c63f7226254bec0ff10.tar.gz chat-5a58fc41c2ab1c3995ff8c63f7226254bec0ff10.tar.bz2 chat-5a58fc41c2ab1c3995ff8c63f7226254bec0ff10.zip | |
Minor change to bold and italic parsing to be more similar to code parsing
| -rw-r--r-- | web/static/js/marked/lib/marked.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/static/js/marked/lib/marked.js b/web/static/js/marked/lib/marked.js index 4085649a5..7f2438069 100644 --- a/web/static/js/marked/lib/marked.js +++ b/web/static/js/marked/lib/marked.js @@ -226,8 +226,8 @@ var inline = { link: /^!?\[(inside)\]\(href\)/, reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/, nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/, - strong: /^\*((?:\*\*|[\s\S])+?)\*/, - em: /^\b_((?:[^_]|__)+?)_\b/, + strong: /^(\*{1})\s*([^\r?\n|\r]*?[^\*])\s*\1(?!\*)/, + em: /^(_{1})\s*([^\r?\n|\r]*?[^_])\s*\1(?!_)/, code: /^(`{1})\s*([^\r?\n|\r]*?[^`])\s*\1(?!`)/, br: /^ {2,}\n(?!\s*$)/, del: noop, |