diff options
Diffstat (limited to 'library')
| -rw-r--r-- | library/mcefixes/plugins.bbcode.editor_plugin_src.js | 16 | ||||
| -rw-r--r-- | library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js | 16 |
2 files changed, 26 insertions, 6 deletions
diff --git a/library/mcefixes/plugins.bbcode.editor_plugin_src.js b/library/mcefixes/plugins.bbcode.editor_plugin_src.js index a2829a21c..f94fbc5d7 100644 --- a/library/mcefixes/plugins.bbcode.editor_plugin_src.js +++ b/library/mcefixes/plugins.bbcode.editor_plugin_src.js @@ -46,10 +46,19 @@ function rep(re, str) {
+
+s = s.replace(re,str);
+
//modify code to keep stuff intact within [code][/code] blocks
//Waitman Gobble NO WARRANTY
+/* This doesn't seem to work well with
+[code]line1
+line2[/code]
+commenting out for now
+*/
+/*
var o = new Array();
var x = s.split("[code]");
var i = 0;
@@ -71,7 +80,7 @@ }
s = o.join("[code]");
-
+*/
};
@@ -150,8 +159,8 @@ rep(/<blockquote[^>]*>/gi,"[quote]");
rep(/<\/blockquote>/gi,"[/quote]");
rep(/<hr \/>/gi,"[hr]");
- rep(/<br (.*?)\/>/gi,"\n\n");
- rep(/<br\/>/gi,"\n\n");
+ rep(/<br (.*?)\/>/gi,"\n");
+ rep(/<br\/>/gi,"\n");
rep(/<br>/gi,"\n");
rep(/<p>/gi,"");
rep(/<\/p>/gi,"\n");
@@ -171,6 +180,7 @@ function rep(re, str) {
+
//modify code to keep stuff intact within [code][/code] blocks
//Waitman Gobble NO WARRANTY
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js index a2829a21c..f94fbc5d7 100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js @@ -46,10 +46,19 @@ function rep(re, str) {
+
+s = s.replace(re,str);
+
//modify code to keep stuff intact within [code][/code] blocks
//Waitman Gobble NO WARRANTY
+/* This doesn't seem to work well with
+[code]line1
+line2[/code]
+commenting out for now
+*/
+/*
var o = new Array();
var x = s.split("[code]");
var i = 0;
@@ -71,7 +80,7 @@ }
s = o.join("[code]");
-
+*/
};
@@ -150,8 +159,8 @@ rep(/<blockquote[^>]*>/gi,"[quote]");
rep(/<\/blockquote>/gi,"[/quote]");
rep(/<hr \/>/gi,"[hr]");
- rep(/<br (.*?)\/>/gi,"\n\n");
- rep(/<br\/>/gi,"\n\n");
+ rep(/<br (.*?)\/>/gi,"\n");
+ rep(/<br\/>/gi,"\n");
rep(/<br>/gi,"\n");
rep(/<p>/gi,"");
rep(/<\/p>/gi,"\n");
@@ -171,6 +180,7 @@ function rep(re, str) {
+
//modify code to keep stuff intact within [code][/code] blocks
//Waitman Gobble NO WARRANTY
|