alecpl
2009-04-23 962085baa17a622c83320e27acde0ac06219da39
- Fix text wrapping in HTML editor after switching from plain text to HTML (#1485521)


4 files modified
21 ■■■■■ changed files
CHANGELOG 1 ●●●● patch | view | raw | blame | history
program/js/app.js 7 ●●●●● patch | view | raw | blame | history
program/js/editor.js 3 ●●●● patch | view | raw | blame | history
skins/default/editor_content.css 10 ●●●●● patch | view | raw | blame | history
CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
- Fix text wrapping in HTML editor after switching from plain text to HTML (#1485521)
- Fix auto-complete function hangs with plus sign (#1485815)
- Fix AJAX requests errors handler (#1485000)
- Speed up message list displaying on IE
program/js/app.js
@@ -3789,6 +3789,13 @@
      });
    }
  this.plain2html = function(plainText, id)
    {
    this.set_busy(true, 'converting');
    $(document.getElementById(id)).val('<pre>'+plainText+'</pre>');
    this.set_busy(false);
    }
  /********************************************************/
  /*********        remote request methods        *********/
program/js/editor.js
@@ -75,9 +75,8 @@
  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';
skins/default/editor_content.css
@@ -13,3 +13,13 @@
    margin-top: 2px;
}
pre
{
    margin: 0;
    padding: 0;
        white-space: -o-pre-wrap !important;
    white-space: -moz-pre-wrap !important;
    white-space: pre-wrap !important;
    white-space: pre;
    word-wrap: break-word; /* IE (and Safari) */
}