;
if (include_controls) { // omit controls if this is a pull quote
+
+ let subject = msg.subj ? escapeJS(msg.subj) : "" ;
+
outmsg +=
render_userpic(msg.from) // user avatar
+ "<div class=\"ctdl-mmsg-content\">" // begin content
+ "</a></span>"
+ "<span class=\"ctdl-msg-button\">" // Reply-All (mail is always Quoted)
- + "<a href=\"javascript:mail_compose(true,'"+msg.wefw+"','"+msgnum+"', replyall_to(msg), msg.cccc, 'Re: '+msg.subj);\">"
+ + `<a href="javascript:mail_compose(true, msg.wefw, ${msgnum}, replyall_to(msg), msg.cccc, 'Re: ${subject}');">`
+ "<i class=\"fa fa-reply-all\"></i> "
+ _("ReplyAll")
+ + "</a></span>"
+
+ + "<span class=\"ctdl-msg-button\">" // Forward (server handles this)
+ + "<a href=\"javascript:mail_compose(true,'"+msg.wefw+"','"+msgnum+"', '', '', 'Fwd: '+msg.subj);\">"
+ + "<i class=\"fa fa-mail-forward\"></i> "
+ + _("Forward")
+ "</a></span>";
if (can_delete_messages) {
fetch_stat = async() => {
response = await fetch(url);
stat = await(response.json());
- if (stat.room_mtime > room_mtime) { // FIXME commented out to force refreshes
+ if (stat.room_mtime > room_mtime) { // if modified...
room_mtime = stat.room_mtime;
- render_mailbox_display(newmail_notify.YES);
+ render_mailbox_display(newmail_notify.YES); // ...force a refresh
}
}
fetch_stat();
// Compose a new mail message (called by the Reply button here, or by the dispatcher in views.js)
+//
+// is_quoted true or false depending on whether the user selected "reply quoted" (is this appropriate for mail?)
+// references list of references, be sure to use this in a reply
+// quoted_msgnum if a reply, the msgid of the most recent message in the chain, the one to which we are replying
+// m_to an ARRAY of zero or more recipients to pre-insert into the To: field
+// m_cc an ARRAY of zero or more recipients to pre-insert into the Cc: field
+// m_subject a string to pre-insert into the Subject: field
+//
function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subject) {
+
+ let is_reply = 0;
+
// m_to will be an array of zero or more recipients for the To: field. Convert it to a string.
if (m_to) {
+ is_reply = 1;
m_to = Array.from(new Set(m_to)); // remove dupes
m_to_str = "";
for (i=0; i<m_to.length; ++i) {
// m_to will be an array of zero or more recipients for the Cc: field. Convert it to a string.
if (m_cc) {
+ is_reply = 1;
m_cc = Array.from(new Set(m_cc)); // remove dupes
m_cc_str = "";
for (i=0; i<m_cc.length; ++i) {
// Make the "Write mail" button disappear. We're already there!
document.getElementById("ctdl-newmsg-button").style.display = "none";
- // is_quoted true or false depending on whether the user selected "reply quoted" (is this appropriate for mail?)
- // references list of references, be sure to use this in a reply
- // msgid if a reply, the msgid of the most recent message in the chain, the one to which we are replying
-
// Now display the screen. (Yes, I combined regular strings + template literals. I just learned template literals. Converting to all template literals would be fine.)
compose_screen =
// Hidden values that we are storing right here in the document tree for later
+ "<div class=\"ctdl-compose-message-box\" id=\"ctdl-editor-body\" contenteditable=\"true\">"
;
+ // If this is a quoted reply, insert a div within which we will render the original message.
if (is_quoted) {
- compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\"></div></blockquote>";
+ compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\">QUOTED MESSAGE HERE</div></blockquote>";
}
// The button bar is a Grid element, and is also a Flexbox container.
</div>`
;
+
document.getElementById("ctdl-main").innerHTML = compose_screen;
- mail_display_message(quoted_msgnum, document.getElementById(quoted_div_name), 0);
+
if (m_cc) {
document.getElementById("ctdl-compose-cc-label").style.display = "block";
document.getElementById("ctdl-compose-cc-field").style.display = "block";
}
activate_uploads("ctdl-editor-body");
+
+ // If this is a quoted reply, render the original message into the div we set up earlier.
+ if (is_quoted) {
+ document.getElementById(quoted_div_name).innerHTML = quoted_msgnum;
+ mail_display_message(quoted_msgnum, document.getElementById(quoted_div_name), 0);
+ }
+
+ if (is_reply) {
+ setTimeout(() => { document.getElementById("ctdl-editor-body").focus(); }, 0);
+ }
+ else {
+ setTimeout(() => { document.getElementById("ctdl-compose-to-field").focus(); }, 0);
+ }
+
}
// Called when the user clicks the button to make the hidden "CC" and "BCC" lines appear.
// It is also called automatically during a Reply when CC is pre-populated.
function make_cc_bcc_visible() {
document.getElementById("ctdl-cc-bcc-buttons").style.display = "none";
+ document.getElementById("ctdl-compose-cc-label").style.display = "block";
+ document.getElementById("ctdl-compose-cc-field").style.display = "block";
document.getElementById("ctdl-compose-bcc-label").style.display = "block";
document.getElementById("ctdl-compose-bcc-field").style.display = "block";
}
}
}
}
- boundary = randomString();
- body_text =
- "--" + boundary + "\r\n"
- + "Content-type: text/html\r\n"
- + "Content-transfer-encoding: quoted-printable\r\n"
- + "\r\n"
- + quoted_printable_encode(
- "<html><body>" + document.getElementById("ctdl-editor-body").innerHTML + "</body></html>"
- ) + "\r\n"
- + "--" + boundary + "--\r\n"
- ;
+ body_text = "<html><body>" + document.getElementById("ctdl-editor-body").innerHTML + "</body></html>\r\n";
var request = new XMLHttpRequest();
request.open("PUT", url, true);
- request.setRequestHeader("Content-type", "multipart/mixed; boundary=\"" + boundary + "\"");
+ request.setRequestHeader("Content-type", "text/html");
request.onreadystatechange = function() {
if (request.readyState == 4) {
document.body.style.cursor = "default";
projects / citadel.git / blobdiff