From b0a8e3693090bd96fc31c4c5f42b77f8fddf9b90 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 24 Feb 2016 05:18:09 -0500
Subject: [PATCH] Fix handling of body parameter in mail compose request
---
program/js/editor.js | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 200d8c8..17eee6b 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -513,10 +513,10 @@
message = message.substring(0, p) + sig + message.substring(p, message.length);
cursor_pos = p - 1;
}
- // empty message
- else if (!message) {
- message = '\n\n' + sig;
- cursor_pos = 0;
+ // empty message or new-message mode
+ else if (!message || !rcmail.env.compose_mode) {
+ cursor_pos = message.length;
+ message += '\n\n' + sig;
}
else if (rcmail.env.top_posting && !rcmail.env.sig_below) {
// at cursor position
@@ -555,8 +555,10 @@
sigElem = $('<div id="_rc_sig"></div>').get(0);
// insert at start or at cursor position in top-posting mode
- // (but not if the content is empty)
- if (rcmail.env.top_posting && !rcmail.env.sig_below && (body.childNodes.length > 1 || $(body).text())) {
+ // (but not if the content is empty and not in new-message mode)
+ if (rcmail.env.top_posting && !rcmail.env.sig_below
+ && rcmail.env.compose_mode && (body.childNodes.length > 1 || $(body).text())
+ ) {
this.editor.getWin().focus(); // correct focus in IE & Chrome
var node = this.editor.selection.getNode();
@@ -566,7 +568,7 @@
}
else {
body.appendChild(sigElem);
- position_element = rcmail.env.top_posting ? body.firstChild : $(sigElem).prev();
+ position_element = rcmail.env.top_posting && rcmail.env.compose_mode ? body.firstChild : $(sigElem).prev();
}
}
--
Gitblit v1.9.1