]> code.citadel.org Git - citadel.git/blobdiff - webcit-ng/static/js/view_mail.js
When forwarding an email, pre-load its attachments.
[citadel.git] / webcit-ng / static / js / view_mail.js
index 5179973e809b15cfb71e7add50fb1351d6071f2c..f1596dcae7c5a5425cf08f080cd1c33ddf4ae799 100644 (file)
@@ -153,19 +153,19 @@ function mail_render_one(msgnum, msg, target_div, include_controls) {
                        + "<span class=\"ctdl-msg-header-buttons\">"            // begin buttons on right side
                
                        + "<span class=\"ctdl-msg-button\">"                    // Reply
-                       + `<a href="javascript:mail_compose(true, msg.wefw, ${msgnum}, reply_addr(msg), [], 'Re: ${subject}');">`
+                       + `<a href="javascript:mail_compose(msg.wefw, ${msgnum}, reply_addr(msg), [], 'Re: ${subject}');">`
                        + "<i class=\"fa fa-reply\"></i> " 
                        + _("Reply")
                        + "</a></span>"
                
                        + "<span class=\"ctdl-msg-button\">"                    // Reply-All
-                       + `<a href="javascript:mail_compose(true, msg.wefw, ${msgnum}, replyall_to(msg), msg.cccc, 'Re: ${subject}');">`
+                       + `<a href="javascript:mail_compose(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 FIXME
-                       + "<a>"
+                       + "<span class=\"ctdl-msg-button\">"
+                       + `<a href="javascript:mail_compose(msg.wefw, ${msgnum}, [], [], 'Fwd: ${subject}');">`
                        + "<i class=\"fa fa-mail-forward\"></i> " 
                        + _("Forward")
                        + "</a></span>";
@@ -216,8 +216,8 @@ function mail_render_one(msgnum, msg, target_div, include_controls) {
                          "</div>";                                             // end header
                }
 
-               // Display attachments, if any are present
-               if (msg.part) {
+               // Display attachments, if any are present (don't do this if we're quoting the message)
+               if ( (msg.part) && (include_controls) ) {
                        let display_attachments = 0;
                        for (let r=0; r<msg.part.length; ++r) {
                                if (msg.part[r].disp == "attachment") {
@@ -471,16 +471,18 @@ function recipient_array_to_string(recps_arr) {
 
 // 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
+//                     (set to 0 if this is not a reply)
 // 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) {
+function mail_compose(references, quoted_msgnum, m_to, m_cc, m_subject) {
 
        let is_reply = 0;
+       let is_quoted = (quoted_msgnum > 0) ? true : false ;
+       let is_fwd = (is_quoted && m_to.length==0 && m_cc.length==0) ;
 
        // m_to will be an array of zero or more recipients for the To: field.  Convert it to a string.
        m_to_str = recipient_array_to_string(m_to);
@@ -526,8 +528,11 @@ function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subjec
        ;
 
        // 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 + "\">QUOTED MESSAGE HERE</div></blockquote>";
+       if (is_quoted && is_fwd) {
+               compose_screen += "<br><br>" + _("--- forwarded message ---") + "<br><div id=\"" + quoted_div_name + "\">QUOTE</div>";
+       }
+       else if (is_quoted) {
+               compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\">QUOTE</div></blockquote>";
        }
 
        // The button bar is a Grid element, and is also a Flexbox container.
@@ -550,14 +555,19 @@ function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subjec
                document.getElementById("ctdl-compose-cc-field").style.display = "block";
        }
 
-       activate_uploads("ctdl-editor-body");
+       activate_uploads("ctdl-editor-body");                           // create the attachments window
+       attachment_counter_divs.push("ctdl_num_attachments");           // make the Attachments: count at the bottom update too
 
        // 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 this is a forwarded messages, preload its attachments into the forwarded copy.
+       if (is_fwd) {
+               forward_attachments(quoted_msgnum);
+       }
+
        if (is_reply) {
                setTimeout(() => { document.getElementById("ctdl-editor-body").focus(); }, 0);
        }