diff options
| author | Aleksander Machniak <alec@alec.pl> | 2015-01-25 18:01:04 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2015-01-25 18:01:04 +0100 |
| commit | b0c902622352713a481088104ad9adfe4a06b18e (patch) | |
| tree | 7bf43719364dc46457f0ef592d789bf9b14532dc | |
| parent | 556d288754c13141b42f0a4dd4889078265c6f45 (diff) | |
Fix bug where signature could have been inserted twice after plain-to-html switch (#1490239)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/js/editor.js | 6 |
2 files changed, 5 insertions, 2 deletions
@@ -16,6 +16,7 @@ CHANGELOG Roundcube Webmail - Fix bug where drafts list wasn't refreshed after draft message was sent from another window (#1490238) - Fix keyboard navigation and css in datepicker widget across many Firefox versions - Fix false warning when opening attached text/plain files (#1490241) +- Fix bug where signature could have been inserted twice after plain-to-html switch (#1490239) RELEASE 1.1-rc -------------- diff --git a/program/js/editor.js b/program/js/editor.js index 2fc3429ab..92165348a 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -213,8 +213,10 @@ function rcube_text_editor(config, id) content = input.val(); // replace current text signature with temp mark - if (is_sig) - content = content.replace(signature.text, sig_mark); + if (is_sig) { + content = content.replace(/\r\n/, "\n"); + content = content.replace(signature.text.replace(/\r\n/, "\n"), sig_mark); + } var init_editor = function(data) { // replace signature mark with html version of the signature |