diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js index a061f0925..a4b261090 100644 --- a/dev/Knoin/Knoin.js +++ b/dev/Knoin/Knoin.js @@ -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} diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js index c445a3876..fcf1e02e5 100644 --- a/dev/Screen/User/MailBox.js +++ b/dev/Screen/User/MailBox.js @@ -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); diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 3a0fb21ea..7ea0fdcea 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -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()); } /**