Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-01 13:39:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use JavaScript Optional chaining

Browse source
This commit is contained in:
the-djmaze 2022-09-02 11:52:07 +02:00
parent d9bc435e2c
commit 732b6eb641
55 changed files with 169 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dev/Settings/User/Accounts.js
View file

@ -30,7 +30,7 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
}
editAccount(account) {
if (account && account.isAdditional()) {
if (account?.isAdditional()) {
showScreenPopup(AccountPopupView, [account]);
}
}
@ -48,7 +48,7 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
* @returns {void}
*/
deleteAccount(accountToRemove) {
if (accountToRemove && accountToRemove.askDelete()) {
if (accountToRemove?.askDelete()) {
this.accountForDeletion(null);
if (accountToRemove) {
this.accounts.remove((account) => accountToRemove === account);
@ -72,7 +72,7 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
* @returns {void}
*/
deleteIdentity(identityToRemove) {
if (identityToRemove && identityToRemove.askDelete()) {
if (identityToRemove?.askDelete()) {
this.identityForDeletion(null);
if (identityToRemove) {

2
dev/Settings/User/Filters.js
View file

@ -50,6 +50,6 @@ export class UserSettingsFilters /*extends AbstractViewSettings*/ {
}
onShow() {
window.Sieve && window.Sieve.updateList();
window.Sieve?.updateList();
}
}

8
dev/Settings/User/Themes.js
View file

@ -74,7 +74,7 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
.on('onComplete', (id, result, data) => {
themeBackground.loading(false);
if (result && id && data && data.Result && data.Result.Name && data.Result.Hash) {
if (result && id && data?.Result?.Name && data?.Result?.Hash) {
themeBackground.name(data.Result.Name);
themeBackground.hash(data.Result.Hash);
} else {
@ -94,11 +94,7 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
}
}
if (!errorMsg && data.ErrorMessage) {
errorMsg = data.ErrorMessage;
}
themeBackground.error(errorMsg || i18n('SETTINGS_THEMES/ERROR_UNKNOWN'));
themeBackground.error(errorMsg || data.ErrorMessage || i18n('SETTINGS_THEMES/ERROR_UNKNOWN'));
}
return true;