- Added an example in editor.js to help the skin developers know the possibility of sending config. parameter to TinyMCE

 - Small fix to allow the script to work in IE6 and IE7

git-svn-id: https://svn.roundcube.net/trunk@4720 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 7 insertions, 1 deletions

diff --git a/roundcubemail/program/js/editor.js b/roundcubemail/program/js/editor.js
index 323381b56..1df0fa2ef 100644
--- a/roundcubemail/program/js/editor.js
+++ b/roundcubemail/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/roundcubemail/skins/default/functions.js b/roundcubemail/skins/default/functions.js
index c9d63e9ed..65ac39d38 100644
--- a/roundcubemail/skins/default/functions.js
+++ b/roundcubemail/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"
+};