diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-01-27 07:14:55 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-01-27 07:14:55 +0100 |
| commit | 444d82a5328433fbe48e18b928d35218905a756c (patch) | |
| tree | 84bd92072bf37eee3b54ebf7cb9ccaf408562e67 /tinymce | |
| parent | 6558ee1e2210fb41b1f4d95f806ee441a565087d (diff) | |
| parent | d2dddd995abef2d0805901b278647bef0ce50f88 (diff) | |
| download | volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.gz volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.bz2 volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'tinymce')
| -rw-r--r-- | tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js | 5 |
1 files changed, 5 insertions, 0 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 f12975ba2..ebccfb311 100644 --- a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +++ b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js @@ -53,6 +53,10 @@ rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");
rep(/<span style=\"color:(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");
rep(/<font>(.*?)<\/font>/gi,"$1");
+ rep(/<img.*?width=\"(.*?)\".*?height=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$1x$2]$3[/img]");
+ rep(/<img.*?height=\"(.*?)\".*?width=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$2x$1]$3[/img]");
+ rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");
+ rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");
rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");
rep(/<\/(strong|b)>/gi,"[/b]");
@@ -96,6 +100,7 @@ rep(/\[\/u\]/gi,"</u>");
rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
+ 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
|