mirror of
https://github.com/mjl-/mox.git
synced 2025-02-05 18:58:30 +03:00
when autocompleting, abort previous still pending request
should prevent a long list of "Autocompleting address" mentions in the status bar at the top in case of non-responsive network
This commit is contained in:
parent
22f46aa174
commit
406fdc312d
2 changed files with 18 additions and 2 deletions
|
@ -1609,6 +1609,7 @@ const newAddressComplete = () => {
|
|||
let completeMatches;
|
||||
let completeSearch;
|
||||
let completeFull;
|
||||
let aborter = {};
|
||||
return async function keydown(e) {
|
||||
const target = e.target;
|
||||
if (!datalist) {
|
||||
|
@ -1634,14 +1635,21 @@ const newAddressComplete = () => {
|
|||
else if (search === completeSearch) {
|
||||
return;
|
||||
}
|
||||
if (aborter.abort) {
|
||||
aborter.abort();
|
||||
}
|
||||
aborter = {};
|
||||
try {
|
||||
[completeMatches, completeFull] = await withStatus('Autocompleting addresses', client.CompleteRecipient(search));
|
||||
[completeMatches, completeFull] = await withStatus('Autocompleting addresses', client.withOptions({ aborter: aborter }).CompleteRecipient(search));
|
||||
completeSearch = search;
|
||||
dom._kids(datalist, (completeMatches || []).map(s => dom.option(s)));
|
||||
}
|
||||
catch (err) {
|
||||
log('autocomplete error', errmsg(err));
|
||||
}
|
||||
finally {
|
||||
aborter = {};
|
||||
}
|
||||
};
|
||||
};
|
||||
const flagList = (miv) => {
|
||||
|
|
|
@ -577,6 +577,8 @@ const newAddressComplete = (): any => {
|
|||
let completeSearch: string
|
||||
let completeFull: boolean
|
||||
|
||||
let aborter: {abort?: () => void} = {}
|
||||
|
||||
return async function keydown(e: KeyboardEvent) {
|
||||
const target = e.target as HTMLInputElement
|
||||
if (!datalist) {
|
||||
|
@ -603,12 +605,18 @@ const newAddressComplete = (): any => {
|
|||
} else if (search === completeSearch) {
|
||||
return
|
||||
}
|
||||
if (aborter.abort) {
|
||||
aborter.abort()
|
||||
}
|
||||
aborter = {}
|
||||
try {
|
||||
[completeMatches, completeFull] = await withStatus('Autocompleting addresses', client.CompleteRecipient(search))
|
||||
[completeMatches, completeFull] = await withStatus('Autocompleting addresses', client.withOptions({aborter: aborter}).CompleteRecipient(search))
|
||||
completeSearch = search
|
||||
dom._kids(datalist, (completeMatches || []).map(s => dom.option(s)))
|
||||
} catch (err) {
|
||||
log('autocomplete error', errmsg(err))
|
||||
} finally {
|
||||
aborter = {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue