Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-03 14:37:02 +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) {

2
dev/View/Popup/Account.js
View file

@ -41,7 +41,7 @@ export class AccountPopupView extends AbstractViewPopup {
this.submitErrorAdditional((data && data.ErrorMessageAdditional) || '');
} else {
rl.app.accountsAndIdentities();
this.closeCommand();
this.close();
}
}, {
Email: email,

2
dev/View/Popup/AdvancedSearch.js
View file

@ -57,7 +57,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
MessagelistUserStore.mainSearch(search);
}
this.closeCommand();
this.close();
}
parseSearchStringValue(search) {

4
dev/View/Popup/Ask.js
View file

@ -22,13 +22,13 @@ export class AskPopupView extends AbstractViewPopup {
}
yesClick() {
this.closeCommand();
this.close();
isFunction(this.fYesAction) && this.fYesAction();
}
noClick() {
this.closeCommand();
this.close();
isFunction(this.fNoAction) && this.fNoAction();
}

8
dev/View/Popup/Compose.js
View file

@ -544,7 +544,7 @@ export class ComposePopupView extends AbstractViewPopup {
|| getNotification(Notification.CantSendMessage));
}
} else {
this.closeCommand();
this.close();
}
setFolderHash(this.draftsFolder(), '');
setFolderHash(sSentFolder, '');
@ -633,7 +633,7 @@ export class ComposePopupView extends AbstractViewPopup {
aUidForRemove = [this.draftUid()];
messagesDeleteHelper(sFromFolderFullName, aUidForRemove);
MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, aUidForRemove);
this.closeCommand();
this.close();
}
]);
}
@ -1183,11 +1183,11 @@ export class ComposePopupView extends AbstractViewPopup {
tryToClosePopup() {
if (AskPopupView.hidden()) {
if (this.bSkipNextHide || (this.isEmptyForm() && !this.draftUid())) {
this.closeCommand();
this.close();
} else {
showScreenPopup(AskPopupView, [
i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
() => this.closeCommand()
() => this.close()
]);
}
}

6
dev/View/Popup/Contacts.js
View file

@ -136,7 +136,7 @@ export class ContactsPopupView extends AbstractViewPopup {
});
decorateKoCommands(this, {
// closeCommand: self => !self.watchDirty(),
// close: self => !self.watchDirty(),
deleteCommand: self => 0 < self.contactsCheckedOrSelected().length,
newMessageCommand: self => 0 < self.contactsCheckedOrSelected().length,
saveCommand: self => !self.viewSaving() && !self.viewReadOnly()
@ -182,7 +182,7 @@ export class ContactsPopupView extends AbstractViewPopup {
if (arrayLength(aE)) {
this.bBackToCompose = false;
this.closeCommand();
this.close();
switch (this.sLastComposeFocusedField) {
case 'cc':
@ -500,7 +500,7 @@ export class ContactsPopupView extends AbstractViewPopup {
if (this.watchDirty() && AskPopupView.hidden()) {
showScreenPopup(AskPopupView, [
i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
() => this.closeCommand()
() => this.close()
]);
return false;
}

2
dev/View/Popup/Domain.js
View file

@ -220,7 +220,7 @@ export class DomainPopupView extends AbstractViewPopup {
this.savingError(getNotification(iError));
} else {
DomainAdminStore.fetch();
this.closeCommand();
this.close();
}
}

2
dev/View/Popup/DomainAlias.js
View file

@ -42,7 +42,7 @@ export class DomainAliasPopupView extends AbstractViewPopup {
this.savingError(getNotification(iError));
} else {
DomainAdminStore.fetch();
this.closeCommand();
this.close();
}
}, {
Name: this.name(),

2
dev/View/Popup/Filter.js
View file

@ -51,7 +51,7 @@ export class FilterPopupView extends AbstractViewPopup {
if (this.filter().verify()) {
this.fTrueCallback();
this.closeCommand();
this.close();
}
}

2
dev/View/Popup/FolderClear.js
View file

@ -54,7 +54,7 @@ export class FolderClearPopupView extends AbstractViewPopup {
this.clearingError(getNotification(iError));
} else {
MessagelistUserStore.reload(true);
this.closeCommand();
this.close();
}
}, {
Folder: folderToClear.fullName

2
dev/View/Popup/FolderCreate.js
View file

@ -75,7 +75,7 @@ export class FolderCreatePopupView extends AbstractViewPopup {
}
);
this.closeCommand();
this.close();
}
}

2
dev/View/Popup/Identity.js
View file

@ -97,7 +97,7 @@ export class IdentityPopupView extends AbstractViewPopup {
this.submitError(getNotification(iError));
} else {
rl.app.accountsAndIdentities();
this.closeCommand();
this.close();
}
}, {
Id: this.id,

2
dev/View/Popup/Languages.js
View file

@ -52,6 +52,6 @@ export class LanguagesPopupView extends AbstractViewPopup {
changeLanguage(lang) {
this.fLang && this.fLang(lang);
this.closeCommand();
this.close();
}
}

2
dev/View/Popup/OpenPgpGenerate.js
View file

@ -70,7 +70,7 @@ export class OpenPgpGeneratePopupView extends AbstractViewPopup {
if (keyPair) {
const fn = () => {
this.submitRequest(false);
this.closeCommand();
this.close();
};
OpenPGPUserStore.storeKeyPair(keyPair);

2
dev/View/Popup/OpenPgpImport.js
View file

@ -63,7 +63,7 @@ export class OpenPgpImportPopupView extends AbstractViewPopup {
return;
}
this.closeCommand();
this.close();
}
onShow() {

4
dev/View/Popup/Plugin.js
View file

@ -61,7 +61,7 @@ export class PluginPopupView extends AbstractViewPopup {
Remote.request('AdminPluginSettingsUpdate',
iError => iError
? this.saveError(getNotification(iError))
: this.closeCommand(),
: this.close(),
oConfig);
}
@ -99,7 +99,7 @@ export class PluginPopupView extends AbstractViewPopup {
if (AskPopupView.hidden()) {
showScreenPopup(AskPopupView, [
i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
() => this.closeCommand()
() => this.close()
]);
}
return false;