diff options
| author | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-13 03:31:05 +0000 |
|---|---|---|
| committer | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-13 03:31:05 +0000 |
| commit | 6ca3cd1c85e6e37d57c62c84ce33a36848ed9edc (patch) | |
| tree | 810afa1923fc0295c6be20c85523af52d3ca8f52 | |
| parent | 8e3cb8606e219e19b8c1619ab172f4d1dec121ed (diff) | |
fix switching between HTML/plain composing (#1484752)
git-svn-id: https://svn.roundcube.net/trunk@1060 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/js/editor.js | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 47be08931..75c6c52d5 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -3,6 +3,7 @@ CHANGELOG RoundCube Webmail 2008/02/12 (estadtherr) ---------- +- fix switching between HTML/plain composing (#1484752) - condense TinyMCE toolbar down to one line, removing table buttons (#1484747) - fix image removal in message display when message HTML includes JS event handlers diff --git a/roundcubemail/program/js/editor.js b/roundcubemail/program/js/editor.js index 2f58fe0b1..98dde2eca 100644 --- a/roundcubemail/program/js/editor.js +++ b/roundcubemail/program/js/editor.js @@ -63,9 +63,10 @@ function rcmail_toggle_editor(toggler) // determine the currently displayed editor var htmlFlag = document.getElementsByName('_is_html')[0]; - var currentEditor = htmlFlag.value; + var isHtml = htmlFlag.value; - if (selectedEditor == currentEditor) + if (((selectedEditor == 'plain') && (isHtml == "0")) || + ((selectedEditor == 'html') && (isHtml == "1"))) { return; } |