aboutsummaryrefslogtreecommitdiffstats
path: root/library/tinymce
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-04 17:15:43 -0700
committerfriendica <info@friendica.com>2012-07-04 17:15:43 -0700
commit5589bca1e031517cc440c7f2896f107dbb57296e (patch)
tree3c1b780f22fe3a745d4cab5de3386a5779686a87 /library/tinymce
parentfd626022ec02ef47b9142bba08180502babbd0ca (diff)
downloadvolse-hubzilla-5589bca1e031517cc440c7f2896f107dbb57296e.tar.gz
volse-hubzilla-5589bca1e031517cc440c7f2896f107dbb57296e.tar.bz2
volse-hubzilla-5589bca1e031517cc440c7f2896f107dbb57296e.zip
fix !@#$ tinymce linebreaks for the thousandth time
Diffstat (limited to 'library/tinymce')
-rw-r--r--library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js16
1 files changed, 13 insertions, 3 deletions
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