X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fjs%2Feditor.js;h=3845e3de459714209748d5161a408b41cb91baf4;hb=4212156c5c79d2f58342feb0d3ed1893f177bcab;hp=eeb16ec96eae9244ecd7cd27fc580b8678bbf0e6;hpb=e8a0682b96f5b7f297e58d101735ba20a0cc3a89;p=roundcube.git diff --git a/program/js/editor.js b/program/js/editor.js index eeb16ec..3845e3d 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -1,9 +1,9 @@ /* +-----------------------------------------------------------------------+ - | RoundCube editor js library | + | Roundcube editor js library | | | - | This file is part of the RoundCube web development suite | - | Copyright (C) 2006, RoundCube Dev, - Switzerland | + | This file is part of the Roundcube web development suite | + | Copyright (C) 2006, Roundcube Dev, - Switzerland | | Licensed under the GNU GPL | | | +-----------------------------------------------------------------------+ @@ -18,96 +18,112 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode) { if (mode == 'identity') tinyMCE.init({ - mode : 'textareas', - editor_selector : 'mce_editor', - apply_source_formatting : true, - theme : 'advanced', - language : editor_lang, - content_css : skin_path + '/editor_content.css', - theme_advanced_toolbar_location : 'top', - theme_advanced_toolbar_align : 'left', - 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 + mode: 'textareas', + editor_selector: 'mce_editor', + apply_source_formatting: true, + theme: 'advanced', + language: editor_lang, + content_css: skin_path + '/editor_content.css', + plugins: 'paste,tabfocus', + theme_advanced_toolbar_location: 'top', + theme_advanced_toolbar_align: 'left', + 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 - tinyMCE.init({ - mode : 'textareas', - editor_selector : 'mce_editor', - accessibility_focus : false, - apply_source_formatting : true, - theme : 'advanced', - language : editor_lang, - plugins : 'emotions,media,nonbreaking,table,searchreplace,visualchars,directionality' + (spellcheck ? ',spellchecker' : ''), - theme_advanced_buttons1 : 'bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator' + (spellcheck ? ',spellchecker' : '') + ',undo,redo,image,media,ltr,rtl', - theme_advanced_buttons2 : '', - theme_advanced_buttons3 : '', - theme_advanced_toolbar_location : 'top', - theme_advanced_toolbar_align : 'left', - extended_valid_elements : 'font[face|size|color|style],span[id|class|align|style]', - content_css : skin_path + '/editor_content.css', - 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, - relative_urls : false, - remove_script_host : false, + tinyMCE.init({ + mode: 'textareas', + editor_selector: 'mce_editor', + accessibility_focus: false, + apply_source_formatting: true, + theme: 'advanced', + language: editor_lang, + plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,tabfocus' + (spellcheck ? ',spellchecker' : ''), + theme_advanced_buttons1: 'bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,outdent,indent,ltr,rtl,blockquote,|,forecolor,backcolor,fontselect,fontsizeselect', + theme_advanced_buttons2: 'link,unlink,code,|,emotions,charmap,image,media,|,search' + (spellcheck ? ',spellchecker' : '') + ',undo,redo', + theme_advanced_buttons3: '', + theme_advanced_toolbar_location: 'top', + theme_advanced_toolbar_align: 'left', + extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]', + content_css: skin_path + '/editor_content.css', + 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'), + spellchecker_rpc_url: '?_task=utils&_action=spell&tiny=1', + gecko_spellcheck: true, + remove_script_host: false, + relative_urls: false, + convert_urls: false, // #1486944 rc_client: rcmail, - oninit : 'rcmail_editor_callback' + oninit: 'rcmail_editor_callback' }); } // react to real individual tinyMCE editor init -function rcmail_editor_callback(editor) +function rcmail_editor_callback() { - var input_from = rcube_find_object('_from'); - if (input_from && input_from.type=='select-one') - rcmail.change_identity(input_from); - // set tabIndex - rcmail_editor_tabindex() + var elem = rcube_find_object('_from'), + fe = rcmail.env.compose_focus_elem; + + if (elem && elem.type == 'select-one') { + rcmail.change_identity(elem); + // Focus previously focused element + if (fe && fe.id != rcmail.env.composebody) { + window.focus(); // for WebKit (#1486674) + fe.focus(); + } + } + + // set tabIndex and set focus to element that was focused before + rcmail_editor_tabindex(fe && fe.id == rcmail.env.composebody); + // Trigger resize (needed for proper editor resizing in some browsers using default skin) + $(window).resize(); } // set tabIndex on tinyMCE editor -function rcmail_editor_tabindex() +function rcmail_editor_tabindex(focus) { 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; + if (editor) { + var textarea = editor.getElement(); + var node = editor.getContentAreaContainer().childNodes[0]; + if (textarea && node) + node.tabIndex = textarea.tabIndex; + if (focus) + editor.getWin().focus(); + } } } // switch html/plain mode -function rcmail_toggle_editor(ishtml, textAreaId, flagElement) +function rcmail_toggle_editor(select, textAreaId, flagElement) { - var composeElement = document.getElementById(textAreaId); - var flag; + var flag, ishtml; + + if (select.tagName != 'SELECT') + ishtml = select.checked; + else + ishtml = select.value == 'html'; - if (ishtml) - { - rcmail.display_spellcheck_controls(false); + var res = rcmail.command('toggle-editor', {id:textAreaId, mode:ishtml?'html':'plain'}); - rcmail.plain2html(composeElement.value, textAreaId); - tinyMCE.execCommand('mceAddControl', true, textAreaId); - rcmail_editor_tabindex(); + if (ishtml) { + // #1486593 + setTimeout("rcmail_editor_tabindex(true);", 500); if (flagElement && (flag = rcube_find_object(flagElement))) flag.value = '1'; - } - else - { - if (!confirm(rcmail.get_label('editorwarning'))) - return false; - - var thisMCE = tinyMCE.get(textAreaId); - var existingHtml = thisMCE.getContent(); - rcmail.html2plain(existingHtml, textAreaId); - tinyMCE.execCommand('mceRemoveControl', true, textAreaId); - rcmail.display_spellcheck_controls(true); + } + else { + if (!res && select.tagName == 'SELECT') + select.value = 'html'; if (flagElement && (flag = rcube_find_object(flagElement))) flag.value = '0'; - } -}; + + if (rcmail.env.composebody) + rcube_find_object(rcmail.env.composebody).focus(); + } +}