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

No need for __dom property

Browse source
This commit is contained in:
the-djmaze 2023-10-24 17:07:14 +02:00
parent bd737a82bf
commit e6a60b879e
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dev/Knoin/Knoin.js
View file

@ -48,7 +48,7 @@ const
: createElement('div',{id:'V-'+id,hidden:''}) : createElement('div',{id:'V-'+id,hidden:''})
vmPlace.append(vmDom); vmPlace.append(vmDom);
vm.viewModelDom = ViewModelClass.__dom = vmDom; vm.viewModelDom = vmDom;
if (dialog) { if (dialog) {
// Firefox < 98 / Safari < 15.4 HTMLDialogElement not defined // Firefox < 98 / Safari < 15.4 HTMLDialogElement not defined
@ -136,11 +136,10 @@ const
forEachViewModel = (screen, fn) => { forEachViewModel = (screen, fn) => {
screen.viewModels.forEach(ViewModelClass => { screen.viewModels.forEach(ViewModelClass => {
if ( if (
ViewModelClass.__vm && ViewModelClass.__vm?.viewModelDom &&
ViewModelClass.__dom &&
ViewTypePopup !== ViewModelClass.__vm.viewType ViewTypePopup !== ViewModelClass.__vm.viewType
) { ) {
fn(ViewModelClass.__vm, ViewModelClass.__dom); fn(ViewModelClass.__vm, ViewModelClass.__vm.viewModelDom);
} }
}); });
}, },
@ -150,7 +149,7 @@ const
forEachViewModel(screenToHide, (vm, dom) => { forEachViewModel(screenToHide, (vm, dom) => {
dom.hidden = true; dom.hidden = true;
vm.onHide?.(); vm.onHide?.();
destroy && vm.viewModelDom.remove(); destroy && dom.remove();
}); });
ThemeStore.isMobile() && leftPanelDisabled(true); ThemeStore.isMobile() && leftPanelDisabled(true);
}, },
@ -227,15 +226,11 @@ export const
* @returns {void} * @returns {void}
*/ */
showScreenPopup = (ViewModelClassToShow, params = []) => { showScreenPopup = (ViewModelClassToShow, params = []) => {
const vm = buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom && ViewModelClassToShow.__vm; const vm = buildViewModel(ViewModelClassToShow);
if (vm && vm.viewModelDom) {
if (vm) {
params = params || []; params = params || [];
vm.beforeShow?.(...params); vm.beforeShow?.(...params);
vm.modalVisible(true); vm.modalVisible(true);
vm.onShow?.(...params); vm.onShow?.(...params);
} }
}, },

3
dev/Screen/AbstractSettings.js
View file

@ -30,7 +30,7 @@ export class AbstractSettingsScreen extends AbstractScreen {
if (RoutedSettingsViewModel) { if (RoutedSettingsViewModel) {
// const vmPlace = elementById('V-SettingsPane') || elementById('V-AdminPane); // const vmPlace = elementById('V-SettingsPane') || elementById('V-AdminPane);
const vmPlace = this.viewModels[1].__dom, const vmPlace = this.viewModels[1].__vm.viewModelDom,
SettingsViewModelClass = RoutedSettingsViewModel.vmc; SettingsViewModelClass = RoutedSettingsViewModel.vmc;
if (SettingsViewModelClass.__vm) { if (SettingsViewModelClass.__vm) {
settingsScreen = SettingsViewModelClass.__vm; settingsScreen = SettingsViewModelClass.__vm;
@ -46,7 +46,6 @@ export class AbstractSettingsScreen extends AbstractScreen {
settingsScreen.viewModelDom = viewModelDom; settingsScreen.viewModelDom = viewModelDom;
settingsScreen.viewModelTemplateID = RoutedSettingsViewModel.template; settingsScreen.viewModelTemplateID = RoutedSettingsViewModel.template;
SettingsViewModelClass.__dom = viewModelDom;
SettingsViewModelClass.__vm = settingsScreen; SettingsViewModelClass.__vm = settingsScreen;
fireEvent('rl-view-model.create', settingsScreen); fireEvent('rl-view-model.create', settingsScreen);