Cleanup closeCommand & cancelCommand because both are defined for popups

This commit is contained in:
djmaze 2021-07-16 09:11:10 +02:00
parent c46e190a3a
commit d69743cee5
5 changed files with 9 additions and 9 deletions

View file

@ -78,7 +78,7 @@ class AddOpenPgpKeyPopupView extends AbstractViewPopup {
return false;
}
this.cancelCommand && this.cancelCommand();
this.cancelCommand();
return true;
}

View file

@ -54,7 +54,7 @@ class FilterPopupView extends AbstractViewPopup {
this.fTrueCallback && this.fTrueCallback(this.filter());
this.modalVisibility() && this.closeCommand && this.closeCommand();
this.modalVisibility() && this.closeCommand();
}
return true;

View file

@ -63,7 +63,7 @@ class NewOpenPgpKeyPopupView extends AbstractViewPopup {
openpgpKeyring.store();
rl.app.reloadOpenPgpKeys();
this.cancelCommand && this.cancelCommand();
this.cancelCommand();
}
})
.catch((e) => {

View file

@ -85,7 +85,7 @@ class PluginPopupView extends AbstractViewPopup {
if (!isPopupVisible(AskPopupView)) {
showScreenPopup(AskPopupView, [
i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
() => this.modalVisibility() && this.cancelCommand && this.cancelCommand()
() => this.modalVisibility() && this.cancelCommand()
]);
}
}