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

Renamed closeCommand() to close() because it has no command feature anymore

Browse source
This commit is contained in:
the-djmaze 2022-03-04 09:21:24 +01:00
parent 7f29f362f5
commit fe0f6af9f4
38 changed files with 59 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/Knoin/AbstractViews.js
View file

@ -62,7 +62,7 @@ export class AbstractViewPopup extends AbstractView
this.modalVisible = ko.observable(false).extend({ rateLimit: 0 });
shortcuts.add('escape,close', '', name, () => {
if (this.modalVisible() && false !== this.onClose()) {
this.closeCommand();
this.close();
return false;
}
return true;
@ -80,7 +80,7 @@ export class AbstractViewPopup extends AbstractView
onHide() {} // Happens before animation transitionend
afterHide() {} // Happens after animation transitionend
closeCommand() {}
close() {}
*/
}

16
dev/Knoin/Knoin.js
View file

@ -30,7 +30,9 @@ const
buildViewModel = (ViewModelClass, vmScreen) => {
if (ViewModelClass && !ViewModelClass.__builded) {
let vmDom = null;
const vm = new ViewModelClass(vmScreen),
const
vm = new ViewModelClass(vmScreen),
id = vm.viewModelTemplateID,
position = vm.viewType || '',
dialog = ViewType.Popup === position,
vmPlace = position ? doc.getElementById('rl-' + position.toLowerCase()) : null;
@ -39,16 +41,16 @@ const
ViewModelClass.__vm = vm;
if (vmPlace) {
vmDom = dialog
? Element.fromHTML('<dialog id="V-'+ vm.viewModelTemplateID + '"></dialog>')
: Element.fromHTML('<div id="V-'+ vm.viewModelTemplateID + '" hidden=""></div>');
vmDom = Element.fromHTML(dialog
? '<dialog id="V-'+ id + '"></dialog>'
: '<div id="V-'+ id + '" hidden=""></div>');
vmPlace.append(vmDom);
vm.viewModelDom = vmDom;
ViewModelClass.__dom = vmDom;
if (ViewType.Popup === position) {
vm.closeCommand = () => hideScreenPopup(ViewModelClass);
vm.close = () => hideScreenPopup(ViewModelClass);
// Firefox / Safari HTMLDialogElement not defined
if (!vmDom.showModal) {
@ -110,7 +112,7 @@ const
vmDom,
{
i18nInit: true,
template: () => ({ name: vm.viewModelTemplateID })
template: () => ({ name: id })
},
vm
);
@ -172,7 +174,7 @@ const
// Close all popups
for (let vm of visiblePopups) {
false === vm.onClose() || vm.closeCommand();
false === vm.onClose() || vm.close();
}
if (screenName) {