mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
Renamed closeCommand() to close() because it has no command feature anymore
This commit is contained in:
parent
7f29f362f5
commit
fe0f6af9f4
38 changed files with 59 additions and 57 deletions
|
|
@ -41,7 +41,7 @@ export class AccountPopupView extends AbstractViewPopup {
|
|||
this.submitErrorAdditional((data && data.ErrorMessageAdditional) || '');
|
||||
} else {
|
||||
rl.app.accountsAndIdentities();
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
}, {
|
||||
Email: email,
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
|
|||
MessagelistUserStore.mainSearch(search);
|
||||
}
|
||||
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
|
||||
parseSearchStringValue(search) {
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ export class DomainPopupView extends AbstractViewPopup {
|
|||
this.savingError(getNotification(iError));
|
||||
} else {
|
||||
DomainAdminStore.fetch();
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ export class DomainAliasPopupView extends AbstractViewPopup {
|
|||
this.savingError(getNotification(iError));
|
||||
} else {
|
||||
DomainAdminStore.fetch();
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
}, {
|
||||
Name: this.name(),
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ export class FilterPopupView extends AbstractViewPopup {
|
|||
|
||||
if (this.filter().verify()) {
|
||||
this.fTrueCallback();
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ export class FolderClearPopupView extends AbstractViewPopup {
|
|||
this.clearingError(getNotification(iError));
|
||||
} else {
|
||||
MessagelistUserStore.reload(true);
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
}, {
|
||||
Folder: folderToClear.fullName
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ export class FolderCreatePopupView extends AbstractViewPopup {
|
|||
}
|
||||
);
|
||||
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ export class IdentityPopupView extends AbstractViewPopup {
|
|||
this.submitError(getNotification(iError));
|
||||
} else {
|
||||
rl.app.accountsAndIdentities();
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
}, {
|
||||
Id: this.id,
|
||||
|
|
|
|||
|
|
@ -52,6 +52,6 @@ export class LanguagesPopupView extends AbstractViewPopup {
|
|||
|
||||
changeLanguage(lang) {
|
||||
this.fLang && this.fLang(lang);
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ export class OpenPgpGeneratePopupView extends AbstractViewPopup {
|
|||
if (keyPair) {
|
||||
const fn = () => {
|
||||
this.submitRequest(false);
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
};
|
||||
|
||||
OpenPGPUserStore.storeKeyPair(keyPair);
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ export class OpenPgpImportPopupView extends AbstractViewPopup {
|
|||
return;
|
||||
}
|
||||
|
||||
this.closeCommand();
|
||||
this.close();
|
||||
}
|
||||
|
||||
onShow() {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue