aboutsummaryrefslogtreecommitdiffstats
path: root/tinymce
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-09-17 15:06:37 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-09-17 15:06:37 -0700
commit40bb8d195fe66e87bc3ac301c50c9ae2d0f3f14a (patch)
treeae294a4844f5d536c3b689a170dd4c3c4db48f34 /tinymce
parent9cda87c327a4bab7b25b5d7eedfe063056ed8d7c (diff)
downloadvolse-hubzilla-40bb8d195fe66e87bc3ac301c50c9ae2d0f3f14a.tar.gz
volse-hubzilla-40bb8d195fe66e87bc3ac301c50c9ae2d0f3f14a.tar.bz2
volse-hubzilla-40bb8d195fe66e87bc3ac301c50c9ae2d0f3f14a.zip
fix missing colours
Diffstat (limited to 'tinymce')
-rw-r--r--tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js3
1 files changed, 2 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 86f9e3d62..8728f0c0f 100644
--- a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -51,6 +51,7 @@
// example: <strong> to [b]
rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
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.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");
@@ -96,7 +97,7 @@
rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
- rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<font color=\"$1\">$2</font>");
+ rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");
rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");
rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");