"Cancel bug" fix #188
This commit is contained in:
parent
d5c760e72b
commit
e42ba35697
2 changed files with 14 additions and 6 deletions
16
src/main.ts
16
src/main.ts
|
|
@ -218,13 +218,17 @@ export default class MediaDbPlugin extends Plugin {
|
||||||
(await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => {
|
(await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => {
|
||||||
return await this.queryDetails(selectModalData.selected);
|
return await this.queryDetails(selectModalData.selected);
|
||||||
})) ?? [];
|
})) ?? [];
|
||||||
if (!selectResults) {
|
if (!selectResults || selectResults.length < 1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
proceed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
|
const confirmed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
|
||||||
return previewModalData.confirmed;
|
return previewModalData.confirmed;
|
||||||
});
|
});
|
||||||
|
if (!confirmed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.createMediaDbNotes(selectResults!);
|
await this.createMediaDbNotes(selectResults!);
|
||||||
|
|
@ -248,13 +252,17 @@ export default class MediaDbPlugin extends Plugin {
|
||||||
(await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => {
|
(await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => {
|
||||||
return await this.queryDetails(selectModalData.selected);
|
return await this.queryDetails(selectModalData.selected);
|
||||||
})) ?? [];
|
})) ?? [];
|
||||||
if (!selectResults) {
|
if (!selectResults || selectResults.length < 1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
proceed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
|
const confirmed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
|
||||||
return previewModalData.confirmed;
|
return previewModalData.confirmed;
|
||||||
});
|
});
|
||||||
|
if (!confirmed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.createMediaDbNotes(selectResults!);
|
await this.createMediaDbNotes(selectResults!);
|
||||||
|
|
|
||||||
|
|
@ -505,12 +505,12 @@ export class ModalHelper {
|
||||||
console.warn(previewModalResult.error);
|
console.warn(previewModalResult.error);
|
||||||
new Notice(previewModalResult.error.toString());
|
new Notice(previewModalResult.error.toString());
|
||||||
previewModal.close();
|
previewModal.close();
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (previewModalResult.code === ModalResultCode.CLOSE) {
|
if (previewModalResult.code === ModalResultCode.CLOSE) {
|
||||||
// modal is already being closed
|
// modal is already being closed
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue