aboutsummaryrefslogtreecommitdiffstats
path: root/tinymce/jscripts/tiny_mce
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-02-12 18:31:13 +0100
committerfabrixxm <fabrix.xm@gmail.com>2011-02-12 18:31:13 +0100
commit53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1 (patch)
treeeee6bc94d474e327a233c7053beb46d33036a65d /tinymce/jscripts/tiny_mce
parent26dfb73f48d4fcd4671d136e53f52bb81995ea34 (diff)
parent89cbd17c721dae57b18686fd7f3e5f8c74a279d9 (diff)
downloadvolse-hubzilla-53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1.tar.gz
volse-hubzilla-53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1.tar.bz2
volse-hubzilla-53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1.zip
Merge branch 'friendika-master'
Diffstat (limited to 'tinymce/jscripts/tiny_mce')
-rw-r--r--tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js2
1 files changed, 1 insertions, 1 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 ebccfb311..aad83280d 100644
--- a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -103,7 +103,7 @@
rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");
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(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");
rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");
rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");