Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup and split Enums

Browse source
This commit is contained in:
djmaze 2021-01-24 22:58:06 +01:00
parent 864da66b5f
commit f3bfa0e8c1
31 changed files with 315 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/Knoin/Knoin.js
View file

@ -180,12 +180,12 @@ function buildViewModel(ViewModelClass, vmScreen) {
}
}
return ViewModelClass ? ViewModelClass.__vm : null;
return ViewModelClass && ViewModelClass.__vm;
}
function getScreenPopupViewModel(ViewModelClassToShow) {
const ModalView = getScreenPopup(ViewModelClassToShow);
return (buildViewModel(ModalView) && ModalView.__dom) ? ModalView.__vm : null;
return (buildViewModel(ModalView) && ModalView.__dom) && ModalView.__vm;
}
/**
@ -221,7 +221,7 @@ export function warmUpScreenPopup(ViewModelClassToShow) {
*/
export function isPopupVisible(ViewModelClassToShow) {
const ModalView = getScreenPopup(ViewModelClassToShow);
return ModalView && ModalView.__vm ? ModalView.__vm.modalVisibility() : false;
return ModalView && ModalView.__vm && ModalView.__vm.modalVisibility();
}
/**
@ -329,7 +329,7 @@ export function startScreens(screensClasses) {
screensClasses.forEach(CScreen => {
if (CScreen) {
const vmScreen = new CScreen(),
screenName = vmScreen ? vmScreen.screenName() : '';
screenName = vmScreen && vmScreen.screenName();
if (vmScreen && screenName) {
if (!defaultScreenName) {