Only attempt to insert quote when replying to mail.

Also do that after rendering the attachments window.
Doing it before doesn't work.
I don't know why.

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index d058f470ecf35727d3820f4e455275e6c4c720d2..830768a50476e3b83124a27f667fbee52ed818c0 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -502,8 +502,9 @@ function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subjec
                + "<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.
@@ -518,14 +519,21 @@ function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subjec
                </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);
+       }
 }
 
 // Called when the user clicks the button to make the hidden "CC" and "BCC" lines appear.