summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/editor.js5
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 47be08931..75c6c52d5 100644
--- a/CHANGELOG
+++ b/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/program/js/editor.js b/program/js/editor.js
index 2f58fe0b1..98dde2eca 100644
--- a/program/js/editor.js
+++ b/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;
}