the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-12-26 00:51:24 +08:00
Code Issues Projects Releases Packages Wiki Activity

Rename Identity.formattedName to Identity.toString

Browse source
This commit is contained in:
the-djmaze 2024-10-28 12:01:59 +01:00
parent 64e780e500
commit 1b4bf3b8c3
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/Model/Identity.js
View file

@ -40,7 +40,7 @@ export class IdentityModel extends EmailModel /*AbstractModel*/ {
/** /**
* @returns {string} * @returns {string}
*/ */
formattedName() { toString() {
const name = this.name, const name = this.name,
email = this.email, email = this.email,
label = this.label(); label = this.label();

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

@ -122,7 +122,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
identityMainDesc: () => { identityMainDesc: () => {
const identity = IdentityUserStore.main(); const identity = IdentityUserStore.main();
return identity ? identity.formattedName() : '---'; return identity ? identity.toString() : '---';
}, },
editorDefaultTypes: () => { editorDefaultTypes: () => {

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

@ -344,7 +344,7 @@ export class ComposePopupView extends AbstractViewPopup {
IdentityUserStore.map(item => ({ IdentityUserStore.map(item => ({
item: item, item: item,
optValue: item.id(), optValue: item.id(),
optText: item.formattedName() optText: item
})), })),
canBeSentOrSaved: () => !this.sending() && !this.saving() canBeSentOrSaved: () => !this.sending() && !this.saving()
@ -359,7 +359,7 @@ export class ComposePopupView extends AbstractViewPopup {
currentIdentity: value => { currentIdentity: value => {
if (value) { if (value) {
this.from(value.formattedName()); this.from(value.toString());
this.doEncrypt(value.pgpEncrypt() || SettingsUserStore.pgpEncrypt()); this.doEncrypt(value.pgpEncrypt() || SettingsUserStore.pgpEncrypt());
this.doSign(value.pgpSign() || SettingsUserStore.pgpSign()); this.doSign(value.pgpSign() || SettingsUserStore.pgpSign());
} }
@ -455,7 +455,7 @@ export class ComposePopupView extends AbstractViewPopup {
contactsCommand: self => self.allowContacts contactsCommand: self => self.allowContacts
}); });
this.from(IdentityUserStore()[0].formattedName()); this.from(IdentityUserStore()[0].toString());
} }
sentFolder() sentFolder()

2
snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
View file

@ -57,7 +57,7 @@
<i class="fontastic drag-handle">⬍</i> <i class="fontastic drag-handle">⬍</i>
</td> </td>
<td class="e-action"> <td class="e-action">
<span class="identity-name" data-bind="text: formattedName()"></span> <span class="identity-name" data-bind="text: $data"></span>
<span class="identity-default" data-i18n="GLOBAL/DEFAULT"></span> <span class="identity-default" data-i18n="GLOBAL/DEFAULT"></span>
</td> </td>
<td> <td>