More template literals.

[citadel.git] / webcit-ng / static / js / view_mail.js

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 4e7635f041b980e5293a83d36ccf5b8ab20be1b3..37fcdbbe79ab05d9619ed799f0656f2af0c4be60 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -337,23 +337,23 @@ function mail_render_row(msg, is_selected) {
 // RENDERER FOR THIS VIEW
 function view_render_mail() {
        // Put the "enter new message" button into the topbar
-       document.getElementById("ctdl-newmsg-button").innerHTML = "<i class=\"fa fa-edit\"></i>" + _("Write mail");
+       document.getElementById("ctdl-newmsg-button").innerHTML = `<i class="fa fa-edit"></i>&nbsp;` + _("Write mail");
        document.getElementById("ctdl-newmsg-button").style.display = "block";
 
        // Put the "delete message(s)" button into the topbar
        let d = document.getElementById("ctdl-delete-button");
-       d.innerHTML = "<i class=\"fa fa-trash\"></i>" + _("Delete");
+       d.innerHTML = `<i class="fa fa-trash"></i>&nbsp;` + _("Delete");
        d.style.display = "block";
        //d.addEventListener("click", mail_delete_selected);
 
-       document.getElementById("ctdl-main").innerHTML
-               = "<div id=\"ctdl-mailbox-grid-container\" class=\"ctdl-mailbox-grid-container\">"
-               + "<div id=\"ctdl-mailbox-pane\" class=\"ctdl-mailbox-pane\"></div>"
-               + "<div id=\"ctdl-mailbox-reading-pane\" class=\"ctdl-mailbox-reading-pane\"></div>"
-               + "</div>"
-       ;
+       document.getElementById("ctdl-main").innerHTML = `
+               <div id="ctdl-mailbox-grid-container" class="ctdl-mailbox-grid-container">
+               <div id="ctdl-mailbox-pane" class="ctdl-mailbox-pane"></div>
+               <div id="ctdl-mailbox-reading-pane" class="ctdl-mailbox-reading-pane"></div>
+               </div>
+       `;
 
-       highest_mailnum = 0;                                    // Keep track of highest message number to track newly arrived messages
+       highest_mailnum = 0;                                    // Keep track of highest msg number to track newly arrived msgs
        render_mailbox_display(newmail_notify.NO);
        try {                                                   // if this was already set up, clear it so there aren't multiple
                clearInterval(RefreshMailboxInterval);
@@ -413,12 +413,14 @@ function render_mailbox_display(notify) {
                        }
 
                        // begin rendering the mailbox table
-                       box =   "<table id=\"ctdl-onscreen-mailbox\" class=\"ctdl-mailbox-table\" width=100%><tr>"
-                               + "<th>" + _("Subject") + "</th>"
-                               + "<th>" + _("Sender") + "</th>"
-                               + "<th>" + _("Date") + "</th>"
-                               + "<th>#</th>"
-                               + "</tr>";
+                       box = `
+                               <table id="ctdl-onscreen-mailbox" class="ctdl-mailbox-table" width=100%><tr>
+                               <th>${_("Subject")}</th>
+                               <th>${ _("Sender")}</th>
+                               <th>${_("Date")}</th>
+                               <th>#</th>
+                               </tr>
+                       `;
 
                        for (let i=0; i<msgs.length; ++i) {
                                let m = parseInt(msgs[i].msgnum);
@@ -562,8 +564,10 @@ function mail_compose(references, quoted_msgnum, m_to, m_cc, m_subject) {
        if (is_quoted) {
                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) {
-               console.log("FIXME we have to load the attachments from message " + quoted_msgnum);
+               forward_attachments(quoted_msgnum);
        }
 
        if (is_reply) {