diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-24 07:33:56 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-24 07:33:56 +0100 |
| commit | 4198efe03570606b35f3aba6cdf7f80de20384f4 (patch) | |
| tree | 5a59cf3b29a70f22728e25d7c46ab8648bcda407 /tinymce/jscripts/tiny_mce/plugins | |
| parent | 2319bc43bf3f837c22daa5067dcf538e8b5a792d (diff) | |
| parent | 205a2b8930c9d519c06f106d5d37702f8f69d013 (diff) | |
| download | volse-hubzilla-4198efe03570606b35f3aba6cdf7f80de20384f4.tar.gz volse-hubzilla-4198efe03570606b35f3aba6cdf7f80de20384f4.tar.bz2 volse-hubzilla-4198efe03570606b35f3aba6cdf7f80de20384f4.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'tinymce/jscripts/tiny_mce/plugins')
| -rw-r--r-- | tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js index 8728f0c0f..f12975ba2 100644 --- a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +++ b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js @@ -64,8 +64,8 @@ rep(/<u>/gi,"[u]");
rep(/<blockquote[^>]*>/gi,"[quote]");
rep(/<\/blockquote>/gi,"[/quote]");
- rep(/<br \/>/gi,"\n");
- rep(/<br\/>/gi,"\n");
+ rep(/<br \/>/gi,"\n\n");
+ rep(/<br\/>/gi,"\n\n");
rep(/<br>/gi,"\n");
rep(/<p>/gi,"");
rep(/<\/p>/gi,"\n");
@@ -98,6 +98,7 @@ rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");
+// rep(/\[\/code\]\s*\[code\]/gi,"<br />"); // fold multiline code
rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");
rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");
|