Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 20:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop cancelCommand in favor of closeCommand and improve AbstractViewPopup handling

Browse source
This commit is contained in:
the-djmaze 2022-02-24 22:40:17 +01:00
parent 06b5b83588
commit 2edd55f01f
36 changed files with 82 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

19
dev/View/Popup/Plugin.js
View file

@ -28,11 +28,8 @@ export class PluginPopupView extends AbstractViewPopup {
hasConfiguration: () => 0 < this.config().length
});
this.bDisabeCloseOnEsc = true;
this.keyScope.scope = Scope.All;
this.tryToClosePopup = this.tryToClosePopup.debounce(200);
decorateKoCommands(this, {
saveCommand: self => self.hasConfiguration()
});
@ -64,7 +61,7 @@ export class PluginPopupView extends AbstractViewPopup {
Remote.request('AdminPluginSettingsUpdate',
iError => iError
? this.saveError(getNotification(iError))
: this.cancelCommand(),
: this.closeCommand(),
oConfig);
}
@ -98,21 +95,13 @@ export class PluginPopupView extends AbstractViewPopup {
}
}
tryToClosePopup() {
onClose() {
if (AskPopupView.hidden()) {
showScreenPopup(AskPopupView, [
i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
() => this.modalVisibility() && this.cancelCommand()
() => this.closeCommand()
]);
}
}
onBuild() {
shortcuts.add('escape', '', Scope.All, () => {
if (this.modalVisibility()) {
this.tryToClosePopup();
return false;
}
});
return false;
}
}