From 7d9b4e2e642d647f63b239ec1211f61951989f8d Mon Sep 17 00:00:00 2001
From: Bret McMillan <bretm@redhat.com>
Date: Mon, 17 Nov 2008 17:37:17 -0500
Subject: headers aren't eating the world now, many other tags are commented
 out until unit-test pages look decent

---
 .../tiny_mce/plugins/mediawiki/editor_plugin.js    | 29 +++++++++++-----------
 .../tiny_mce/plugins/mediawiki/wiki2html.js        |  6 ++---
 2 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'extensions/tinymce/jscripts/tiny_mce')

diff --git a/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/editor_plugin.js b/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/editor_plugin.js
index e69dc5f..566af50 100644
--- a/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/editor_plugin.js
+++ b/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/editor_plugin.js
@@ -68,7 +68,7 @@
 			    m.replace(/<li>(.*?)<\/li>/gim, glyph + "$1");
 
 			    // TODO:  fixme, this needs to be recursive...
-			    //m = t['convertlists'](m);
+			    m = t['convertlists'](m);
 
 			    return m;
 			});
@@ -111,29 +111,25 @@
 			rep(/<h3>(.*?)<\/h3>/gim, "===$1===");
 			rep(/<h4>(.*?)<\/h4>/gim, "====$1====");
 			rep(/<h5>(.*?)<\/h5>/gim, "=====$1=====");
-			rep(/<h5>(.*?)<\/h6>/gim, "======$1======");
+			rep(/<h6>(.*?)<\/h6>/gim, "======$1======");
 
-			// <p>
-			rep(/<p>([\s\S]*?)<\/p>/gim, '\n$1');
 
+			// block elements, spacing, etc...
 
+			// <p>
+			//rep(/<p>([\s\S]*?)<\/p>/gim, '$1\n');
 			// <p align>
-			rep(/<p.*?align\: left.*?>([\s\S]*?)<\/p>/gim, '\n$1');
-
+			//rep(/<p.*?align\: left.*?>([\s\S]*?)<\/p>/gim, '\n$1');
 			// various indents...
 			// <p style="padding-left"...>
-			rep(/<p .*?padding\-left.*?>([\s\S]*?)<\/p>/gim, '\n  $1');
-			rep(/<pre>([\s\S]*?)<\/pre>/gim, '\n $1');
-			rep(/<blockquote>([\s\S]*?)<\/blockquote>/gim, '\n  $1');
-
-                        // <nbsp>
-			rep(/\&nbsp\;/gim, ' ');
-
+			//rep(/<p .*?padding\-left.*?>([\s\S]*?)<\/p>/gim, '\n  $1');
+			//rep(/<pre>([\s\S]*?)<\/pre>/gim, '\n $1');
+			//rep(/<blockquote>([\s\S]*?)<\/blockquote>/gim, '\n  $1');
 			// <br>
-			rep(/<br[^>]*?>/gim, '\n');
+			//rep(/<br[^>]*?>/gim, '\n');
 
 			// ul,ol lists
-			s = t['convertlists'](s);
+			// s = t['convertlists'](s);
 
 			// tables
 			// XXXXXXXXXXXXXXXXXXXXXX
@@ -145,6 +141,9 @@
 			// probably due to a tinymce cleanup function repairing bad html
 			// rep(/\s*?<td\/>\s*?/gim, "");
 
+			// <nbsp>
+			//rep(/\&nbsp\;/gim, ' ');
+
 			return s;
 		},
 
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 + '>';
         })
     
-- 
cgit