Imported Upstream version 0.3

[roundcube.git] / program / js / editor.js

diff --git a/program/js/editor.js b/program/js/editor.js
index a3f0d34922a4cb7f029bbd1f3e65ca24e7310cff..eeb16ec96eae9244ecd7cd27fc580b8678bbf0e6 100644 (file)
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -17,7 +17,8 @@
 function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
 {
   if (mode == 'identity')
-    tinyMCE.init({ mode : 'textareas',
+    tinyMCE.init({
+      mode : 'textareas',
       editor_selector : 'mce_editor',
       apply_source_formatting : true,
       theme : 'advanced',
@@ -28,6 +29,8 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
       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_buttons3 : '',
+      relative_urls : false,
+      remove_script_host : false,
       gecko_spellcheck : true
     });
   else // mail compose
@@ -49,7 +52,9 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
       external_image_list_url : 'program/js/editor_images.js',
       spellchecker_languages : (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'),
       gecko_spellcheck : true,
-      rc_client: rcube_webmail_client,
+      relative_urls : false,
+      remove_script_host : false,
+      rc_client: rcmail,
       oninit : 'rcmail_editor_callback'
     });
 }
@@ -58,8 +63,22 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
 function rcmail_editor_callback(editor)
 {
   var input_from = rcube_find_object('_from');
-  if(input_from && input_from.type=='select-one')
+  if (input_from && input_from.type=='select-one')
     rcmail.change_identity(input_from);
+  // set tabIndex
+  rcmail_editor_tabindex()
+}
+
+// set tabIndex on tinyMCE editor
+function rcmail_editor_tabindex()
+{
+  if (rcmail.env.task == 'mail') {
+    var editor = tinyMCE.get(rcmail.env.composebody);
+    var textarea = editor.getElement();
+    var node = editor.getContentAreaContainer().childNodes[0];
+    if (textarea && node)
+      node.tabIndex = textarea.tabIndex;
+  }
 }
 
 // switch html/plain mode
@@ -70,12 +89,11 @@ function rcmail_toggle_editor(ishtml, textAreaId, flagElement)
 
   if (ishtml)
     {
-    var existingPlainText = composeElement.value;
-    var htmlText = "<pre>" + existingPlainText + "</pre>";
-
     rcmail.display_spellcheck_controls(false);
-    composeElement.value = htmlText;
+
+    rcmail.plain2html(composeElement.value, textAreaId);
     tinyMCE.execCommand('mceAddControl', true, textAreaId);
+    rcmail_editor_tabindex();
     if (flagElement && (flag = rcube_find_object(flagElement)))
       flag.value = '1';
     }