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

Cleanup AppUserStore

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

35
dev/Knoin/AbstractViews.js
View file

@ -1,41 +1,41 @@
import ko from 'ko';
import { inFocus, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'Common/Utils';
import { KeyState } from 'Common/Enums';
import { Scope } from 'Common/Enums';
import { keyScope } from 'Common/Globals';
import { ViewType } from 'Knoin/Knoin';
class AbstractView {
bDisabeCloseOnEsc = false;
sDefaultKeyScope = KeyState.None;
sCurrentKeyScope = KeyState.None;
viewModelVisible = false;
modalVisibility = ko.observable(false).extend({ rateLimit: 0 });
viewModelName = '';
viewModelDom = null;
constructor(name, templateID, type)
{
this.viewModelName = 'View/' + name;
this.viewModelTemplateID = templateID;
this.viewModelPosition = type;
this.bDisabeCloseOnEsc = false;
this.sDefaultScope = Scope.None;
this.sCurrentScope = Scope.None;
this.viewModelVisible = false;
this.modalVisibility = ko.observable(false).extend({ rateLimit: 0 });
this.viewModelName = '';
this.viewModelDom = null;
}
/**
* @returns {void}
*/
storeAndSetKeyScope() {
this.sCurrentKeyScope = keyScope();
keyScope(this.sDefaultKeyScope);
storeAndSetScope() {
this.sCurrentScope = keyScope();
keyScope(this.sDefaultScope);
}
/**
* @returns {void}
*/
restoreKeyScope() {
keyScope(this.sCurrentKeyScope);
restoreScope() {
keyScope(this.sCurrentScope);
}
cancelCommand() {}
@ -64,6 +64,9 @@ export class AbstractViewPopup extends AbstractView
constructor(name)
{
super('Popup/' + name, 'Popups' + name, ViewType.Popup);
if (name in Scope) {
this.sDefaultScope = Scope[name];
}
}
/**

4
dev/Knoin/Knoin.js
View file

@ -111,7 +111,7 @@ function buildViewModel(ViewModelClass, vmScreen) {
if (value) {
vmDom.style.zIndex = 3000 + popupVisibilityNames.length + 10;
vmDom.hidden = false;
vm.storeAndSetKeyScope();
vm.storeAndSetScope();
popupVisibilityNames.push(vm.viewModelName);
requestAnimationFrame(() => { // wait just before the next paint
vmDom.offsetHeight; // force a reflow
@ -120,7 +120,7 @@ function buildViewModel(ViewModelClass, vmScreen) {
} else {
vm.onHide && vm.onHide();
vmDom.classList.remove('show');
vm.restoreKeyScope();
vm.restoreScope();
popupVisibilityNames = popupVisibilityNames.filter(v=>v!==vm.viewModelName);
}
vmDom.setAttribute('aria-hidden', !value);