- Fix text wrapping in HTML editor after switching from plain text to HTML (#1485521)

git-svn-id: https://svn.roundcube.net/trunk@2417 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 8 insertions, 2 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 43e0aa984..65b7c835d 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -3789,6 +3789,13 @@ function rcube_webmail()
       });
     }
 
+  this.plain2html = function(plainText, id)
+    {
+    this.set_busy(true, 'converting');
+    $(document.getElementById(id)).val('<pre>'+plainText+'</pre>');
+    this.set_busy(false);
+    }
+
 
   /********************************************************/
   /*********        remote request methods        *********/
diff --git a/roundcubemail/program/js/editor.js b/roundcubemail/program/js/editor.js
index 7f937b2b8..6826af847 100644
--- a/roundcubemail/program/js/editor.js
+++ b/roundcubemail/program/js/editor.js
@@ -75,9 +75,8 @@ function rcmail_toggle_editor(ishtml, textAreaId, flagElement)
   if (ishtml)
     {
     rcmail.display_spellcheck_controls(false);
-    var htmlText = "<pre>" + composeElement.value + "</pre>";
 
-    composeElement.value = htmlText;
+    rcmail.plain2html(composeElement.value, textAreaId);
     tinyMCE.execCommand('mceAddControl', true, textAreaId);
     if (flagElement && (flag = rcube_find_object(flagElement)))
       flag.value = '1';