diff options
author | Bret McMillan <bretm@redhat.com> | 2008-11-17 17:37:17 -0500 |
---|---|---|
committer | Bret McMillan <bretm@redhat.com> | 2008-11-17 17:37:17 -0500 |
commit | 7d9b4e2e642d647f63b239ec1211f61951989f8d (patch) | |
tree | f1f652a6989e0c1f760f99e9338860ea775524cf /extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js | |
parent | bd912471fd8d0fc26039b5a83253b2c17d77fe8c (diff) | |
download | mediawiki-stuff-master.tar.gz mediawiki-stuff-master.tar.xz mediawiki-stuff-master.zip |
headers aren't eating the world now, many other tags are commented out until unit-test pages look decentHEADmaster
Diffstat (limited to 'extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js')
-rw-r--r-- | extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js b/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js index 2d3f442..312e8b4 100644 --- a/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js +++ b/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js @@ -88,9 +88,9 @@ function wiki2html(s) { }) /* BLOCK ELEMENTS */ - .replace(/(?:^|\n+)([^# =\*<].+)(?:\n+|$)/gm, function (m, l) { + .replace(/(?:^\s*|\n+\s*)([^\s\+\|#=\*<].+)(?:\s*\n+|$)/gm, function (m, l) { if (l.match(/^\^+$/)) return l; - return "\n<p>" + l + "</p>\n"; + return "<p>" + l + "</p>\n"; }) .replace(/(?:^|\n)[ ]{2}(.*)+/g, function (m, l) { // blockquotes @@ -103,7 +103,7 @@ function wiki2html(s) { return '<pre>' + m.replace(/(^|\n)[ ]+/g, "$1") + '</pre>'; }) - .replace(/(?:^|\n)([=]+)(.*)\1/g, function (m, l, t) { // headings + .replace(/^([=]+)(.*?)\1/mg, function (m, l, t) { // headings return '<h' + l.length + '>' + t + '</h' + l.length + '>'; }) |