@bobfrankston/rmfmail 1.2.12 → 1.2.14

package/client/app.bundle.js

@@ -8136,12 +8136,6 @@ async function deleteSelectedMessages() {
 This cannot be undone.`)) {
       return;
     }
-  } else if (n > 1) {
-    if (!confirm(`Move ${n} messages to Trash?
-
-(Ctrl+Z restores them if this was a mistake.)`)) {
-      return;
-    }
   }
   const statusSync = document.getElementById("status-sync");
   const snapshot = [...selected];
@@ -9629,18 +9623,29 @@ document.addEventListener("keydown", (e) => {
     const active = document.activeElement;
     const inText = active && (active.tagName === "INPUT" || active.tagName === "TEXTAREA" || active.tagName === "SELECT" || active.isContentEditable);
     if (!e.ctrlKey && inText) return;
+    e.preventDefault();
+    const applySeen = (m, seen) => {
+      setSeen(m, seen);
+      updateFlags(m.accountId, m.uid, m.flags).then(() => {
+        updateMessageFlags(m.accountId, m.uid, m.flags);
+        const row = document.querySelector(`.ml-row[data-uid="${m.uid}"][data-account-id="${CSS.escape(m.accountId)}"]`);
+        if (row) row.classList.toggle("unread", !seen);
+      }).catch(() => {
+        setSeen(m, !seen);
+      });
+    };
+    const selectedIds = getSelectedMessages();
+    if (selectedIds.length > 1) {
+      const all = getMessages2();
+      for (const id of selectedIds) {
+        const m = all.find((x) => x.accountId === id.accountId && x.uid === id.uid && x.folderId === id.folderId);
+        if (m && !seenOf(m)) applySeen(m, true);
+      }
+      return;
+    }
     const sel = getCurrentFocused();
     if (!sel) return;
-    e.preventDefault();
-    const wasSeen = seenOf(sel);
-    setSeen(sel, !wasSeen);
-    updateFlags(sel.accountId, sel.uid, sel.flags).then(() => {
-      updateMessageFlags(sel.accountId, sel.uid, sel.flags);
-      const row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
-      if (row) row.classList.toggle("unread", wasSeen);
-    }).catch(() => {
-      setSeen(sel, wasSeen);
-    });
+    applySeen(sel, !seenOf(sel));
   }
   if (e.key.toLowerCase() === "z" && !e.ctrlKey && !e.metaKey && !e.altKey) {
     const active = document.activeElement;