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

Remove rl.showScreenPopup in favour of AbstractViewPopup.showModal

Browse source
This commit is contained in:
the-djmaze 2022-02-07 15:20:39 +01:00
parent 649f74fc51
commit f6400b6da2
5 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/Knoin/AbstractViews.js
View file

@ -3,8 +3,7 @@ import ko from 'ko';
import { inFocus, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'Common/Utils';
import { Scope } from 'Common/Enums';
import { keyScope, Settings, leftPanelDisabled } from 'Common/Globals';
import { ViewType } from 'Knoin/Knoin';
//import { showScreenPopup } from 'Knoin/Knoin';
import { ViewType, showScreenPopup } from 'Knoin/Knoin';
class AbstractView {
constructor(templateID, type)
@ -88,11 +87,11 @@ export class AbstractViewPopup extends AbstractView
});
}
}
/*
AbstractViewPopup.show = function(params = []) {
AbstractViewPopup.showModal = function(params = []) {
showScreenPopup(this, params);
}
*/
AbstractViewPopup.hidden = function() {
return !this.__vm || !this.__vm.modalVisibility();
}

8
dev/Knoin/Knoin.js
View file

@ -244,10 +244,7 @@ const
}, 1);
}
}
},
getScreenPopupViewModel = ViewModelClassToShow =>
(buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom) && ViewModelClassToShow.__vm;
};
export const
@ -281,7 +278,8 @@ export const
* @returns {void}
*/
showScreenPopup = (ViewModelClassToShow, params = []) => {
const vm = getScreenPopupViewModel(ViewModelClassToShow);
const vm = buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom && ViewModelClassToShow.__vm;
if (vm) {
params = params || [];