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 8e31a18cf5c67cfaf7f928b1be175e64305b4a03..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();
@@ -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)
@@ -561,21 +562,20 @@ function mail_send_message() {
                 + "&mailcc="    + msm_field("ctdl-compose-cc-field", ",")                       // Cc: (if present)
                 + "&mailbcc="   + msm_field("ctdl-compose-bcc-field", ",")                      // Bcc: (if present)
         ;
-       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"
-       ;
+       if (uploads.length > 0) {
+               url += "&att=";
+               for (let i=0; i<uploads.length; ++i) {
+                       url += uploads[i]["ref"];
+                       if (i != uploads.length - 1) {
+                               url += ",";
+                       }
+               }
+       }
+       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";
@@ -587,6 +587,9 @@ function mail_send_message() {
                                         }
                                 }
  
+                               // successfully saving a message means the attachments are now gone from the server.
+                               uploads = [];
+
                                 // After saving the message, go back to the mailbox view.
                                 gotoroom(current_room);