infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 08:58:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

when clearing search, open inbox

Browse Source 
feedback from jonathan, thanks!
This commit is contained in:
Mechiel Lukkien 2023-08-10 10:42:54 +02:00
parent 038b478d16
commit f48a53726e
No known key found for this signature in database
2 changed files with 30 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
webmail/webmail.js
View File

@ -3993,7 +3993,7 @@ const init = async () => {
await selectLabel(); await selectLabel();
})); }));
}), labels.length === 0 ? dom.div('No labels yet, set one on a message first.') : [])); }), labels.length === 0 ? dom.div('No labels yet, set one on a message first.') : []));
})), ' ', dom.clickbutton('x', style({ padding: '0 .25em' }), attr.arialabel('Clear refinement filters'), attr.title('Clear refinement filters.'), async function click(e) { })), ' ', dom.clickbutton('x', style({ padding: '0 .25em' }), attr.arialabel('Clear refinement filters.'), attr.title('Clear refinement filters.'), async function click(e) {
settingsPut({ ...settings, refine: '' }); settingsPut({ ...settings, refine: '' });
refineToggleActive(e.target); refineToggleActive(e.target);
await withStatus('Requesting messages', requestNewView(false)); await withStatus('Requesting messages', requestNewView(false));
@ -4162,38 +4162,20 @@ const init = async () => {
ensureSearchView(); ensureSearchView();
} }
searchView.updateForm(); searchView.updateForm();
}), dom.clickbutton('x', attr.arialabel('Cancel and clear search.'), attr.title('Cancel and clear search.'), style({ marginLeft: '.25em', padding: '0 .3em' }), async function click() { }), dom.clickbutton('x', attr.arialabel('Cancel and clear search and open Inbox.'), attr.title('Cancel and clear search and open Inbox.'), style({ marginLeft: '.25em', padding: '0 .3em' }), async function click() {
searchbarElem.value = ''; searchbarElem.value = '';
if (!search.active) { if (!search.active) {
return; return;
} }
clearList(); const mb = mailboxlistView.findMailboxByName('Inbox');
unloadSearch(); if (!mb) {
updatePageTitle(); window.alert('Cannot find inbox.');
setLocationHash(); return;
if (requestID) {
requestSequence++;
requestID = requestSequence;
const query = {
OrderAsc: settings.orderAsc,
Filter: newFilter(),
NotFilter: newNotFilter()
};
const page = { AnchorMessageID: 0, Count: 0, DestMessageID: 0 };
const request = {
ID: requestID,
SSEID: sseID,
ViewID: viewID,
Cancel: true,
Query: query,
Page: page,
};
dom._kids(queryactivityElem);
await withStatus('Canceling query', client.Request(request));
}
else {
dom._kids(queryactivityElem);
} }
await mailboxlistView.openMailboxID(mb.ID, true);
const f = newFilter();
f.MailboxID = mb.ID;
await withStatus('Requesting messages', requestNewView(true, f, newNotFilter()));
}), async function submit(e) { }), async function submit(e) {
e.preventDefault(); e.preventDefault();
await searchView.submit(); await searchView.submit();

51
webmail/webmail.ts
View File

@ -4098,7 +4098,7 @@ const init = async () => {
dom.clickbutton( dom.clickbutton(
'x', 'x',
style({padding: '0 .25em'}), style({padding: '0 .25em'}),
attr.arialabel('Clear refinement filters'), attr.arialabel('Clear refinement filters.'),
attr.title('Clear refinement filters.'), attr.title('Clear refinement filters.'),
async function click(e: MouseEvent) { async function click(e: MouseEvent) {
settingsPut({...settings, refine: ''}) settingsPut({...settings, refine: ''})
@ -4349,38 +4349,27 @@ const init = async () => {
searchView.updateForm() searchView.updateForm()
}, },
), ),
dom.clickbutton('x', attr.arialabel('Cancel and clear search.'), attr.title('Cancel and clear search.'), style({marginLeft: '.25em', padding: '0 .3em'}), async function click() { dom.clickbutton('x',
searchbarElem.value = '' attr.arialabel('Cancel and clear search and open Inbox.'),
if (!search.active) { attr.title('Cancel and clear search and open Inbox.'),
return style({marginLeft: '.25em', padding: '0 .3em'}),
} async function click() {
clearList() searchbarElem.value = ''
unloadSearch() if (!search.active) {
updatePageTitle() return
setLocationHash()
if (requestID) {
requestSequence++
requestID = requestSequence
const query = {
OrderAsc: settings.orderAsc,
Filter: newFilter(),
NotFilter: newNotFilter()
} }
const page = {AnchorMessageID: 0, Count: 0, DestMessageID: 0}
const request = { const mb = mailboxlistView.findMailboxByName('Inbox')
ID: requestID, if (!mb) {
SSEID: sseID, window.alert('Cannot find inbox.')
ViewID: viewID, return
Cancel: true,
Query: query,
Page: page,
} }
dom._kids(queryactivityElem) await mailboxlistView.openMailboxID(mb.ID, true)
await withStatus('Canceling query', client.Request(request)) const f = newFilter()
} else { f.MailboxID = mb.ID
dom._kids(queryactivityElem) await withStatus('Requesting messages', requestNewView(true, f, newNotFilter()))
} },
}), ),
async function submit(e: SubmitEvent) { async function submit(e: SubmitEvent) {
e.preventDefault() e.preventDefault()
await searchView.submit() await searchView.submit()