diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-04-08 18:39:23 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-04-08 18:39:23 +0000 |
| commit | 3a2819c634df3b477294433fc3840ab8ea7052a5 (patch) | |
| tree | 6c2001ddaa607cfdcf9eed5746cea6de97ed43e9 | |
| parent | a4f25908266416b7aad1934568786ca15cd05d98 (diff) | |
- Fix adding signature separator in html mode (#1485350)
git-svn-id: https://svn.roundcube.net/trunk@2379 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/js/app.js | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 23606e0e4..ee805d1bd 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix adding signature separator in html mode (#1485350) - Fix opening attachment marks message as read (#1485803) - Fix 'temp_dir' does not support relative path under Windows (#1484529) - Fix "Initialize Database" button missing from installer (#1485802) diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index 7f1e7241b..51cce5df3 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -2210,6 +2210,13 @@ function rcube_webmail() { newsig = this.env.signatures[id]['text']; htmlsig = this.env.signatures[id]['is_html']; + + if (newsig) { + if (htmlsig && this.env.signatures[id]['plain_text'].indexOf('-- ')!=0) + newsig = '<p>-- </p>' + newsig; + else if (!htmlsig && newsig.indexOf('-- ')!=0) + newsig = '-- \n' + newsig; + } } if (htmlsig) |