From c3d51860c3c335c5cedb7af537dba0709263f411 Mon Sep 17 00:00:00 2001 From: rolux Date: Wed, 20 Jun 2012 09:23:39 +0200 Subject: [PATCH] update markdown parser and css --- source/Ox.UI/css/Ox.UI.css | 2 +- source/Ox/js/HTML.js | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css index 50718580..f7620166 100644 --- a/source/Ox.UI/css/Ox.UI.css +++ b/source/Ox.UI/css/Ox.UI.css @@ -1971,7 +1971,7 @@ SourceViewer font-family: Menlo, Monaco, DejaVu Sans Mono, Bitstream Vera Sans Mono, Consolas, Lucida Console, monospace; font-size: 11px; } -.OxSourceViewer td.OxComment > pre > code { +.OxSourceViewer td.OxComment > pre { line-height: 16px; margin: 4px 0 4px 0; font-family: Menlo, Monaco, DejaVu Sans Mono, Bitstream Vera Sans Mono, Consolas, Lucida Console, monospace; diff --git a/source/Ox/js/HTML.js b/source/Ox/js/HTML.js index bf73b6a7..8511e6ac 100644 --- a/source/Ox/js/HTML.js +++ b/source/Ox/js/HTML.js @@ -370,11 +370,6 @@ /*@ Ox.parseMarkdown Parses (a tiny subset of) Markdown. - #\*foo\* -> foo - #\*\*foo\*\* -> foo - #\`foo\` -> foo - #\`\`\`foo\`\`\` ->
foo
- #[example](http://example.com "example.com") -> example > Ox.parseMarkdown('*foo* **bar** `baz` ``back`tick``') 'foo bar baz back`tick' > Ox.parseMarkdown('') @@ -409,15 +404,13 @@ function(match, classname, code) { return '
' + code.trim().replace(/
'; + + '>' + code.trim() + '\n'; } ) .replace( /(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm, function(match, prev, backticks, code, next) { - return prev + '' - + code.trim().replace(/'; + return prev + '' + code.trim() + ''; } ) .replace(