mirror of
https://github.com/the-djmaze/snappymail.git
synced 2025-02-23 22:36:01 +08:00
Simplify onWarmUp into onBuild
This commit is contained in:
parent
999389c6c5
commit
60a4a248d1
3 changed files with 5 additions and 18 deletions
|
@ -153,7 +153,7 @@ function buildViewModel(ViewModelClass, vmScreen) {
|
|||
return ViewModelClass && ViewModelClass.__vm;
|
||||
}
|
||||
|
||||
function getScreenPopupViewModel(ViewModelClassToShow) {
|
||||
export function getScreenPopupViewModel(ViewModelClassToShow) {
|
||||
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
|
||||
* @returns {boolean}
|
||||
|
|
|
@ -15,7 +15,7 @@ import { FolderListMailBoxUserView } from 'View/User/MailBox/FolderList';
|
|||
import { MessageListMailBoxUserView } from 'View/User/MailBox/MessageList';
|
||||
import { MessageViewMailBoxUserView } from 'View/User/MailBox/MessageView';
|
||||
|
||||
import { warmUpScreenPopup } from 'Knoin/Knoin';
|
||||
import { getScreenPopupViewModel } from 'Knoin/Knoin';
|
||||
|
||||
import { AbstractScreen } from 'Knoin/AbstractScreen';
|
||||
|
||||
|
@ -88,7 +88,7 @@ export class MailBoxUserScreen extends AbstractScreen {
|
|||
onStart() {
|
||||
if (!this.__started) {
|
||||
super.onStart();
|
||||
setTimeout(() => warmUpScreenPopup(ComposePopupView), 500);
|
||||
setTimeout(() => getScreenPopupViewModel(ComposePopupView), 500);
|
||||
|
||||
addEventListener('mailbox.inbox-unread-count', e => {
|
||||
FolderUserStore.foldersInboxUnreadCount(e.detail);
|
||||
|
|
|
@ -748,12 +748,6 @@ class ComposePopupView extends AbstractViewPopup {
|
|||
}
|
||||
}
|
||||
|
||||
onWarmUp() {
|
||||
if (this.modalVisibility && !this.modalVisibility()) {
|
||||
this.editor(editor => editor.modeWysiwyg());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Function} fKoValue
|
||||
* @param {Array} emails
|
||||
|
@ -1146,6 +1140,8 @@ class ComposePopupView extends AbstractViewPopup {
|
|||
ro.header = dom.querySelector('.b-header');
|
||||
ro.toolbar = dom.querySelector('.b-header-toolbar');
|
||||
ro.els = [dom.querySelector('.textAreaParent'), dom.querySelector('.attachmentAreaParent')];
|
||||
|
||||
this.editor(editor => editor.modeWysiwyg());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue