upload.js: when removing an attachment, delete the div

[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 3071496e8612ae816dc420dfa93e8152a2186e3f..d058f470ecf35727d3820f4e455275e6c4c720d2 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -372,9 +372,9 @@ function refresh_mail_display() {
         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();
@@ -525,7 +525,7 @@ 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-compose-mail");
+       activate_uploads("ctdl-editor-body");
  }
  
  // Called when the user clicks the button to make the hidden "CC" and "BCC" lines appear.
@@ -553,6 +553,7 @@ function msm_field(element_name, separator) {
  function mail_send_message() {
  
         document.body.style.cursor = "wait";
+       deactivate_uploads();
         let url = "/ctdl/r/" + escapeHTMLURI(current_room)
                 + "/dummy_name_for_new_mail"
                 + "?wefw="      + msm_field("ctdl_mc_references", "!")                          // references (if present)
@@ -570,21 +571,11 @@ function mail_send_message() {
                         }
                 }
         }
-       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";