From 5beef180803dd51ae86a194e12159b028fa943c5 Mon Sep 17 00:00:00 2001 From: alec Date: Sat, 6 Mar 2010 18:59:25 +0000 Subject: - Don't show a warning on html2text switch when textarea is empty - Set properly select's value when html2text is aborted git-svn-id: https://svn.roundcube.net/trunk@3334 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/js/editor.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'roundcubemail/program/js/editor.js') diff --git a/roundcubemail/program/js/editor.js b/roundcubemail/program/js/editor.js index 361741e3b..10511a03d 100644 --- a/roundcubemail/program/js/editor.js +++ b/roundcubemail/program/js/editor.js @@ -83,10 +83,15 @@ function rcmail_editor_tabindex() } // 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) { @@ -100,12 +105,19 @@ function rcmail_toggle_editor(ishtml, textAreaId, flagElement) } else { - if (!confirm(rcmail.get_label('editorwarning'))) - return false; - var thisMCE = tinyMCE.get(textAreaId); var existingHtml = thisMCE.getContent(); - rcmail.html2plain(existingHtml, textAreaId); + + if (existingHtml) { + if (!confirm(rcmail.get_label('editorwarning'))) { + if (select.tagName == 'SELECT') + select.value = 'html'; + return false; + } + + rcmail.html2plain(existingHtml, textAreaId); + } + tinyMCE.execCommand('mceRemoveControl', true, textAreaId); rcmail.display_spellcheck_controls(true); if (flagElement && (flag = rcube_find_object(flagElement))) -- cgit v1.2.3