Cleanup AppUserStore

Simplify KeyState/Focused as Scope enum
This commit is contained in:
djmaze 2021-03-16 16:06:16 +01:00
parent 62cb918180
commit eff92c3152
27 changed files with 177 additions and 232 deletions

View file

@ -1,4 +1,4 @@
import { KeyState } from 'Common/Enums';
import { Scope } from 'Common/Enums';
import { i18n } from 'Common/Translator';
import { AbstractViewPopup } from 'Knoin/AbstractViews';
@ -18,7 +18,6 @@ class AskPopupView extends AbstractViewPopup {
this.bFocusYesOnShow = true;
this.bDisabeCloseOnEsc = true;
this.sDefaultKeyScope = KeyState.PopupAsk;
}
clearPopup() {
@ -81,8 +80,8 @@ class AskPopupView extends AbstractViewPopup {
}
onBuild() {
// shortcuts.add('tab', 'shift', KeyState.PopupAsk, () => {
shortcuts.add('tab,arrowright,arrowleft', '', KeyState.PopupAsk, () => {
// shortcuts.add('tab', 'shift', Scope.Ask, () => {
shortcuts.add('tab,arrowright,arrowleft', '', Scope.Ask, () => {
let btn = this.querySelector('.buttonYes');
if (btn.matches(':focus')) {
btn = this.querySelector('.buttonNo');
@ -91,7 +90,7 @@ class AskPopupView extends AbstractViewPopup {
return false;
});
shortcuts.add('escape', '', KeyState.PopupAsk, () => {
shortcuts.add('escape', '', Scope.Ask, () => {
this.noClick();
return false;
});