diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | program/include/main.inc | 18 | ||||
| -rw-r--r-- | program/js/app.js | 43 | ||||
| -rw-r--r-- | program/js/editor.js | 99 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 10 | ||||
| -rw-r--r-- | program/steps/settings/edit_identity.inc | 23 |
6 files changed, 111 insertions, 86 deletions
@@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2008/11/05 (alec) +---------- +- Fix HTML editor initialization on IE (#1485304) + 2008/11/03 (alec) ---------- - Add warning when switching editor mode from html to plain (#1485488) diff --git a/program/include/main.inc b/program/include/main.inc index 21856bc80..bd5156509 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1173,4 +1173,22 @@ function rcmail_localize_foldername($name) } +/** + * Output HTML editor scripts + * + * @param boolean Editor mode (use true for minimal editor) + */ +function rcube_html_editor($mode='') +{ + global $OUTPUT, $CONFIG; + + $lang = $tinylang = strtolower(substr($_SESSION['language'], 0, 2)); + if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$tinylang.'.js')) + $tinylang = 'en'; + + $OUTPUT->include_script('tiny_mce/tiny_mce.js'); + $OUTPUT->include_script('editor.js'); + $OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.JQ($tinylang).'", '.intval($CONFIG['enable_spellcheck']).', "'.$mode.'");'); +} + ?> diff --git a/program/js/app.js b/program/js/app.js index 5c258f93b..d22b1fbfb 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -434,8 +434,12 @@ function rcube_webmail() this.init_address_input_events(input_bcc); // add signature according to selected identity - if (input_from && input_from.type=='select-one' && (!draftid || draftid.value=='')) + if (input_from && input_from.type=='select-one' && (!draftid || draftid.value=='') + // if we have HTML editor, signature is added in callback + && rcube_find_object('_is_html').value != '1') + { this.change_identity(input_from); + } if (input_to && input_to.value=='') input_to.focus(); @@ -2007,7 +2011,7 @@ function rcube_webmail() { if (this.env.spellcheck) { // stop spellchecking process - if (!vis && !this.spellcheck_ready) + if (!vis) this.stop_spellchecking(); this.env.spellcheck.check_link.style.visibility = vis ? 'visible' : 'hidden'; @@ -3622,37 +3626,6 @@ function rcube_webmail() this.enable_command('export', (this.contact_list.rowcount > 0)); }; - this.toggle_editor = function(ishtml, textAreaId, flagElement) - { - var composeElement = document.getElementById(textAreaId); - var flag; - - if (ishtml) - { - var existingPlainText = composeElement.value; - var htmlText = "<pre>" + existingPlainText + "</pre>"; - - this.display_spellcheck_controls(false); - composeElement.value = htmlText; - tinyMCE.execCommand('mceAddControl', true, textAreaId); - 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(); - this.html2plain(existingHtml, textAreaId); - tinyMCE.execCommand('mceRemoveControl', true, textAreaId); - this.display_spellcheck_controls(true); - if (flagElement && (flag = rcube_find_object(flagElement))) - flag.value = '0'; - } - }; - this.toggle_prefer_html = function(checkbox) { var addrbook_show_images; @@ -4150,10 +4123,10 @@ function rcube_http_request() } // end class rcube_http_request - // helper function to call the init method with a delay function call_init(o) { window.setTimeout('if (window[\''+o+'\'] && window[\''+o+'\'].init) { '+o+'.init(); }', - bw.win ? 500 : 200); + bw.win ? 500 : 200); } + diff --git a/program/js/editor.js b/program/js/editor.js index 179d089fc..a3f0d3492 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -13,28 +13,83 @@ $Id: editor.js 000 2006-05-18 19:12:28Z roundcube $ */ -// Initialize the message editor +// Initialize HTML editor +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 : '', + 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, + rc_client: rcube_webmail_client, + oninit : 'rcmail_editor_callback' + }); +} -function rcmail_editor_init(skin_path, editor_lang, spellcheck) +// react to real individual tinyMCE editor init +function rcmail_editor_callback(editor) { - 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, - rc_client: rcube_webmail_client - }); + var input_from = rcube_find_object('_from'); + if(input_from && input_from.type=='select-one') + rcmail.change_identity(input_from); } + +// switch html/plain mode +function rcmail_toggle_editor(ishtml, textAreaId, flagElement) +{ + var composeElement = document.getElementById(textAreaId); + var flag; + + if (ishtml) + { + var existingPlainText = composeElement.value; + var htmlText = "<pre>" + existingPlainText + "</pre>"; + + rcmail.display_spellcheck_controls(false); + composeElement.value = htmlText; + tinyMCE.execCommand('mceAddControl', true, textAreaId); + 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); + if (flagElement && (flag = rcube_find_object(flagElement))) + flag.value = '0'; + } +}; diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 758069acd..fbafc0f26 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -426,13 +426,7 @@ function rcmail_compose_body($attrib) $body = $_SESSION['compose']['param']['_body']; } - $lang = $tinylang = strtolower(substr($_SESSION['language'], 0, 2)); - if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$tinylang.'.js')) - $tinylang = 'en'; - - $OUTPUT->include_script('tiny_mce/tiny_mce.js'); - $OUTPUT->include_script("editor.js"); - $OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.JQ($tinylang).'", '.intval($CONFIG['enable_spellcheck']).');'); + rcube_html_editor(); $out = $form_start ? "$form_start\n" : ''; @@ -855,7 +849,7 @@ function rcmail_editor_selector($attrib) $selector = ''; $chosenvalue = $useHtml ? 'html' : 'plain'; $radio = new html_radiobutton(array('name' => '_editorSelect', - 'onclick' => "return rcmail.toggle_editor(this.value=='html', '$editorid', '_is_html')")); + 'onclick' => "return rcmail_toggle_editor(this.value=='html', '$editorid', '_is_html')")); foreach ($choices as $value => $text) { diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index e4bb50fea..9d3ff4c51 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -51,25 +51,7 @@ function rcube_identity_form($attrib) { global $IDENTITY_RECORD, $RCMAIL, $OUTPUT; - $tinylang = substr($_SESSION['language'], 0, 2); - if (!file_exists('program/js/tiny_mce/langs/'.$tinylang.'.js')) - { - $tinylang = 'en'; - } - - $OUTPUT->include_script('tiny_mce/tiny_mce.js'); - $OUTPUT->add_script("tinyMCE.init({ mode : 'textareas'," . - "editor_selector : 'mce_editor'," . - "apply_source_formatting : true," . - "language : '$tinylang'," . - "content_css : '\$__skin_path' + '/editor_content.css'," . - "theme : 'advanced'," . - "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 : '',". - "gecko_spellcheck : true });"); + rcube_html_editor('identity'); // add some labels to client $OUTPUT->add_label('noemailwarning', 'nonamewarning', 'converting', 'editorwarning'); @@ -81,7 +63,6 @@ function rcube_identity_form($attrib) list($form_start, $form_end) = get_form_tags($attrib, 'save-identity', array('name' => '_iid', 'value' => $IDENTITY_RECORD['identity_id'])); unset($attrib['form']); - // list of available cols $a_show_cols = array('name' => array('type' => 'text', 'size' => $i_size), 'email' => array('type' => 'text', 'size' => $i_size), @@ -89,7 +70,7 @@ function rcube_identity_form($attrib) 'reply-to' => array('type' => 'text', 'label' => 'reply-to', 'size' => $i_size), 'bcc' => array('type' => 'text', 'size' => $i_size), 'signature' => array('type' => 'textarea', 'size' => $t_cols, 'rows' => $t_rows), - 'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this.checked, \'rcmfd_signature\');'), + 'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail_toggle_editor(this.checked, \'rcmfd_signature\');'), 'standard' => array('type' => 'checkbox', 'label' => 'setdefault')); // disable some field according to access level |