summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/js/editor.js2
-rw-r--r--skins/default/functions.js6
2 files changed, 7 insertions, 1 deletions
diff --git a/program/js/editor.js b/program/js/editor.js
index 323381b56..1df0fa2ef 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -39,7 +39,7 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
$.extend(conf, {
plugins: 'paste,tabfocus',
theme_advanced_buttons1: 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor',
- theme_advanced_buttons2: ',fontselect,fontsizeselect',
+ theme_advanced_buttons2: ',fontselect,fontsizeselect'
});
else // mail compose
$.extend(conf, {
diff --git a/skins/default/functions.js b/skins/default/functions.js
index c9d63e9ed..65ac39d38 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -576,3 +576,9 @@ function fit_string_to_size(str, elem, len)
span.parentNode.removeChild(span);
return result;
}
+
+// Optional parameters used by TinyMCE
+var rcmail_editor_settings = {
+ skin : "default", // "default", "o2k7"
+ skin_variant : "" // "", "silver", "black"
+};