summaryrefslogtreecommitdiffstats
path: root/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/editor_plugin.js
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/editor_plugin.js')
-rw-r--r--extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/editor_plugin.js29
1 files changed, 14 insertions, 15 deletions
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;
},