view_mail.js: removed the is_quoted parameter.

is_quoted is now determined by whether quoted_msgnum is nonzero.
In mail, we always pull quote for replies.

diff --git a/webcit-ng/api.txt b/webcit-ng/api.txt
index 189818ef6cd105b9d7fe6305ed02662658e813c1..35de78ef313e60d70aebe3a495019c78762438fb 100644 (file)
--- a/webcit-ng/api.txt
+++ b/webcit-ng/api.txt
@@ -19,7 +19,7 @@ MOVE            /ctdl/r/<roomname>/<msgnum>        Moves a message to another ro
 
 PUT             /ctdl/r/<roomname>/<xxx>           DAV operation to insert a new message into a room
                 Accepted parameters:
-                wefw List of message references
+                wefw List of message references, separated by "!" delimiter
                 subj Message subject
                 The returned ETag will be the new message number.
 

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 5179973e809b15cfb71e7add50fb1351d6071f2c..98eba01c79855435da082067392cfaa5a02a2d6a 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -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>"
+                       + `<a href="javascript:mail_compose(msg.wefw, ${msgnum}, [], [], 'Re: ${subject}');">`
                        + "<i class=\"fa fa-mail-forward\"></i> " 
                        + _("Forward")
                        + "</a></span>";
@@ -471,16 +471,17 @@ 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 ;
 
        // 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);

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index f3707d48c935e373862cf7b207f435522018c50a..be2d48bdb83ae8231343bfad9cf348c545d573bf 100644 (file)
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -115,7 +115,7 @@ function entmsg_dispatcher() {
                        forum_entmsg();
                        break;
                case views.VIEW_MAILBOX:
-                       mail_compose(false, "", 0, "", "", "");
+                       mail_compose("", 0, [], [], "");
                        break;
                default:
                        break;