mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-17 02:05:22 -04:00
Hide pending email send toast after delay
This commit is contained in:
+1
-13
@@ -2806,7 +2806,6 @@ import * as Modals from './modalManager.js';
|
|||||||
let sendSpinner = null;
|
let sendSpinner = null;
|
||||||
let origBtnHtml = '';
|
let origBtnHtml = '';
|
||||||
let detachedEmailDoc = null;
|
let detachedEmailDoc = null;
|
||||||
let slowSendTimer = null;
|
|
||||||
if (btn) {
|
if (btn) {
|
||||||
btn.disabled = true;
|
btn.disabled = true;
|
||||||
origBtnHtml = btn.innerHTML;
|
origBtnHtml = btn.innerHTML;
|
||||||
@@ -2852,10 +2851,7 @@ import * as Modals from './modalManager.js';
|
|||||||
if (uiModule) uiModule.showToast('Send undone');
|
if (uiModule) uiModule.showToast('Send undone');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (uiModule) uiModule.showToast('Sending...', 3500);
|
if (uiModule) uiModule.showToast('Sending...', 2000);
|
||||||
slowSendTimer = setTimeout(() => {
|
|
||||||
if (uiModule) uiModule.showToast('Still sending in background...', 12000);
|
|
||||||
}, 2000);
|
|
||||||
|
|
||||||
const activeAccountId = await _resolveComposeSendAccountId();
|
const activeAccountId = await _resolveComposeSendAccountId();
|
||||||
const res = await fetch(`${API_BASE}/api/email/send`, {
|
const res = await fetch(`${API_BASE}/api/email/send`, {
|
||||||
@@ -2870,10 +2866,6 @@ import * as Modals from './modalManager.js';
|
|||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
if (slowSendTimer) {
|
|
||||||
clearTimeout(slowSendTimer);
|
|
||||||
slowSendTimer = null;
|
|
||||||
}
|
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
if (uiModule) {
|
if (uiModule) {
|
||||||
uiModule.showToast('Message sent', {
|
uiModule.showToast('Message sent', {
|
||||||
@@ -2940,10 +2932,6 @@ import * as Modals from './modalManager.js';
|
|||||||
if (uiModule) uiModule.showError(data.error || 'Failed to send');
|
if (uiModule) uiModule.showError(data.error || 'Failed to send');
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (slowSendTimer) {
|
|
||||||
clearTimeout(slowSendTimer);
|
|
||||||
slowSendTimer = null;
|
|
||||||
}
|
|
||||||
_restoreDetachedEmailDoc(detachedEmailDoc);
|
_restoreDetachedEmailDoc(detachedEmailDoc);
|
||||||
detachedEmailDoc = null;
|
detachedEmailDoc = null;
|
||||||
if (uiModule) uiModule.showError(e?.message ? `Failed to send email: ${e.message}` : 'Failed to send email');
|
if (uiModule) uiModule.showError(e?.message ? `Failed to send email: ${e.message}` : 'Failed to send email');
|
||||||
|
|||||||
Reference in New Issue
Block a user