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

Simplify onWarmUp into onBuild

Browse source
This commit is contained in:
djmaze 2021-04-23 00:12:42 +02:00
parent 999389c6c5
commit 60a4a248d1
3 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dev/Knoin/Knoin.js
View file

@ -153,7 +153,7 @@ function buildViewModel(ViewModelClass, vmScreen) {
return ViewModelClass && ViewModelClass.__vm; return ViewModelClass && ViewModelClass.__vm;
} }
function getScreenPopupViewModel(ViewModelClassToShow) { export function getScreenPopupViewModel(ViewModelClassToShow) {
return (buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom) && ViewModelClassToShow.__vm; return (buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom) && ViewModelClassToShow.__vm;
} }
@ -175,15 +175,6 @@ export function showScreenPopup(ViewModelClassToShow, params = []) {
} }
} }
/**
* @param {Function} ViewModelClassToShow
* @returns {void}
*/
export function warmUpScreenPopup(ViewModelClassToShow) {
const vm = getScreenPopupViewModel(ViewModelClassToShow);
vm && vm.onWarmUp && vm.onWarmUp();
}
/** /**
* @param {Function} ViewModelClassToShow * @param {Function} ViewModelClassToShow
* @returns {boolean} * @returns {boolean}

4
dev/Screen/User/MailBox.js
View file

@ -15,7 +15,7 @@ import { FolderListMailBoxUserView } from 'View/User/MailBox/FolderList';
import { MessageListMailBoxUserView } from 'View/User/MailBox/MessageList'; import { MessageListMailBoxUserView } from 'View/User/MailBox/MessageList';
import { MessageViewMailBoxUserView } from 'View/User/MailBox/MessageView'; import { MessageViewMailBoxUserView } from 'View/User/MailBox/MessageView';
import { warmUpScreenPopup } from 'Knoin/Knoin'; import { getScreenPopupViewModel } from 'Knoin/Knoin';
import { AbstractScreen } from 'Knoin/AbstractScreen'; import { AbstractScreen } from 'Knoin/AbstractScreen';
@ -88,7 +88,7 @@ export class MailBoxUserScreen extends AbstractScreen {
onStart() { onStart() {
if (!this.__started) { if (!this.__started) {
super.onStart(); super.onStart();
setTimeout(() => warmUpScreenPopup(ComposePopupView), 500); setTimeout(() => getScreenPopupViewModel(ComposePopupView), 500);
addEventListener('mailbox.inbox-unread-count', e => { addEventListener('mailbox.inbox-unread-count', e => {
FolderUserStore.foldersInboxUnreadCount(e.detail); FolderUserStore.foldersInboxUnreadCount(e.detail);

8
dev/View/Popup/Compose.js
View file

@ -748,12 +748,6 @@ class ComposePopupView extends AbstractViewPopup {
} }
} }
onWarmUp() {
if (this.modalVisibility && !this.modalVisibility()) {
this.editor(editor => editor.modeWysiwyg());
}
}
/** /**
* @param {Function} fKoValue * @param {Function} fKoValue
* @param {Array} emails * @param {Array} emails
@ -1146,6 +1140,8 @@ class ComposePopupView extends AbstractViewPopup {
ro.header = dom.querySelector('.b-header'); ro.header = dom.querySelector('.b-header');
ro.toolbar = dom.querySelector('.b-header-toolbar'); ro.toolbar = dom.querySelector('.b-header-toolbar');
ro.els = [dom.querySelector('.textAreaParent'), dom.querySelector('.attachmentAreaParent')]; ro.els = [dom.querySelector('.textAreaParent'), dom.querySelector('.attachmentAreaParent')];
this.editor(editor => editor.modeWysiwyg());
} }
/** /**