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

Cleanup unused properties

Browse source
This commit is contained in:
djmaze 2021-03-30 11:48:22 +02:00
parent 5cb150a744
commit 581c89d502
4 changed files with 24 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/Common/Links.js
View file

@ -179,12 +179,13 @@ export function mailBox(folder, page = 1, search = '', threadUid = '') {
} }
if (1 < page) { if (1 < page) {
result = result.replace(/[/]+$/, '') + '/p' + page; result = result.replace(/\/+$/, '') + '/p' + page;
} }
if (search) { if (search) {
result = result.replace(/[/]+$/, '') + '/' + encodeURI(search); result = result.replace(/\/+$/, '') + '/' + encodeURI(search);
} }
return result; return result;
} }

47
dev/View/User/MailBox/MessageList.js
View file

@ -71,7 +71,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
this.message = MessageUserStore.message; this.message = MessageUserStore.message;
this.messageList = MessageUserStore.list; this.messageList = MessageUserStore.list;
this.messageListDisableAutoSelect = MessageUserStore.listDisableAutoSelect;
this.folderList = FolderUserStore.folderList; this.folderList = FolderUserStore.folderList;
this.sortSupported = FolderUserStore.sortSupported; this.sortSupported = FolderUserStore.sortSupported;
@ -79,22 +78,16 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
this.composeInEdit = AppUserStore.composeInEdit; this.composeInEdit = AppUserStore.composeInEdit;
this.leftPanelDisabled = leftPanelDisabled; this.leftPanelDisabled = leftPanelDisabled;
this.selectorMessageSelected = MessageUserStore.selectorMessageSelected;
this.selectorMessageFocused = MessageUserStore.selectorMessageFocused;
this.isMessageSelected = MessageUserStore.isMessageSelected; this.isMessageSelected = MessageUserStore.isMessageSelected;
this.messageListSearch = MessageUserStore.listSearch; this.messageListSearch = MessageUserStore.listSearch;
this.messageListThreadUid = MessageUserStore.listThreadUid;
this.messageListError = MessageUserStore.listError; this.messageListError = MessageUserStore.listError;
this.folderMenuForMove = FolderUserStore.folderMenuForMove; this.folderMenuForMove = FolderUserStore.folderMenuForMove;
this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList; this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList;
this.mainMessageListSearch = MessageUserStore.mainMessageListSearch;
this.messageListEndFolder = MessageUserStore.listEndFolder;
this.messageListEndThreadUid = MessageUserStore.listEndThreadUid; this.messageListEndThreadUid = MessageUserStore.listEndThreadUid;
this.messageListCheckedOrSelected = MessageUserStore.listCheckedOrSelected; this.messageListCheckedOrSelected = MessageUserStore.listCheckedOrSelected;
this.messageListCheckedOrSelectedUidsWithSubMails = MessageUserStore.listCheckedOrSelectedUidsWithSubMails;
this.messageListCompleteLoadingThrottle = MessageUserStore.listCompleteLoading; this.messageListCompleteLoadingThrottle = MessageUserStore.listCompleteLoading;
this.messageListCompleteLoadingThrottleForAnimation = MessageUserStore.listLoadingAnimation; this.messageListCompleteLoadingThrottleForAnimation = MessageUserStore.listLoadingAnimation;
@ -139,7 +132,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
}, },
inputProxyMessageListSearch: { inputProxyMessageListSearch: {
read: this.mainMessageListSearch, read: MessageUserStore.mainMessageListSearch,
write: value => this.sLastSearchValue = value write: value => this.sLastSearchValue = value
}, },
@ -148,19 +141,19 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
return c && MessageUserStore.list.length > c; return c && MessageUserStore.list.length > c;
}, },
hasMessages: () => 0 < this.messageList.length, hasMessages: () => 0 < MessageUserStore.list.length,
isSpamFolder: () => (FolderUserStore.spamFolder() || 0) === this.messageListEndFolder(), isSpamFolder: () => (FolderUserStore.spamFolder() || 0) === MessageUserStore.listEndFolder(),
isSpamDisabled: () => UNUSED_OPTION_VALUE === FolderUserStore.spamFolder(), isSpamDisabled: () => UNUSED_OPTION_VALUE === FolderUserStore.spamFolder(),
isTrashFolder: () => (FolderUserStore.trashFolder() || 0) === this.messageListEndFolder(), isTrashFolder: () => (FolderUserStore.trashFolder() || 0) === MessageUserStore.listEndFolder(),
isDraftFolder: () => (FolderUserStore.draftFolder() || 0) === this.messageListEndFolder(), isDraftFolder: () => (FolderUserStore.draftFolder() || 0) === MessageUserStore.listEndFolder(),
isSentFolder: () => (FolderUserStore.sentFolder() || 0) === this.messageListEndFolder(), isSentFolder: () => (FolderUserStore.sentFolder() || 0) === MessageUserStore.listEndFolder(),
isArchiveFolder: () => (FolderUserStore.archiveFolder() || 0) === this.messageListEndFolder(), isArchiveFolder: () => (FolderUserStore.archiveFolder() || 0) === MessageUserStore.listEndFolder(),
isArchiveDisabled: () => UNUSED_OPTION_VALUE === FolderUserStore.archiveFolder(), isArchiveDisabled: () => UNUSED_OPTION_VALUE === FolderUserStore.archiveFolder(),
@ -197,9 +190,9 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
this.quotaTooltip = this.quotaTooltip.bind(this); this.quotaTooltip = this.quotaTooltip.bind(this);
this.selector = new Selector( this.selector = new Selector(
this.messageList, MessageUserStore.list,
this.selectorMessageSelected, MessageUserStore.selectorMessageSelected,
this.selectorMessageFocused, MessageUserStore.selectorMessageFocused,
'.messageListItem .actionHandle', '.messageListItem .actionHandle',
'.messageListItem .checkboxMessage', '.messageListItem .checkboxMessage',
'.messageListItem.focused' '.messageListItem.focused'
@ -224,7 +217,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
addEventListener('mailbox.message.show', e => { addEventListener('mailbox.message.show', e => {
const sFolder = e.detail.Folder, sUid = e.detail.Uid; const sFolder = e.detail.Folder, sUid = e.detail.Uid;
const message = this.messageList.find( const message = MessageUserStore.list.find(
item => item && sFolder === item.folder && sUid === item.uid item => item && sFolder === item.folder && sUid === item.uid
); );
@ -411,18 +404,18 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
} }
useAutoSelect() { useAutoSelect() {
return !this.messageListDisableAutoSelect() return !MessageUserStore.listDisableAutoSelect()
&& !/is:unseen/.test(this.mainMessageListSearch()) && !/is:unseen/.test(MessageUserStore.mainMessageListSearch())
&& SettingsUserStore.usePreviewPane(); && SettingsUserStore.usePreviewPane();
} }
searchEnterAction() { searchEnterAction() {
this.mainMessageListSearch(this.sLastSearchValue); MessageUserStore.mainMessageListSearch(this.sLastSearchValue);
this.inputMessageListSearchFocus(false); this.inputMessageListSearchFocus(false);
} }
cancelSearch() { cancelSearch() {
this.mainMessageListSearch(''); MessageUserStore.mainMessageListSearch('');
this.inputMessageListSearchFocus(false); this.inputMessageListSearchFocus(false);
} }
@ -676,7 +669,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
!this.messageListSearchDesc() && !this.messageListSearchDesc() &&
!this.messageListError() && !this.messageListError() &&
!this.messageListEndThreadUid() && !this.messageListEndThreadUid() &&
this.messageList.length && MessageUserStore.list.length &&
(this.isSpamFolder() || this.isTrashFolder()) (this.isSpamFolder() || this.isTrashFolder())
); );
} }
@ -776,9 +769,9 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
} }
shortcuts.add('t', '', [Scope.MessageList], () => { shortcuts.add('t', '', [Scope.MessageList], () => {
let message = this.selectorMessageSelected(); let message = MessageUserStore.selectorMessageSelected();
if (!message) { if (!message) {
message = this.selectorMessageFocused(); message = MessageUserStore.selectorMessageFocused();
} }
if (message && 0 < message.threadsLen()) { if (message && 0 < message.threadsLen()) {
@ -861,7 +854,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
prefetchNextTick() { prefetchNextTick() {
if (!this.bPrefetch && !ifvisible.now() && this.viewModelVisible) { if (!this.bPrefetch && !ifvisible.now() && this.viewModelVisible) {
const message = this.messageList.find( const message = MessageUserStore.list.find(
item => item && !hasRequestedMessage(item.folder, item.uid) item => item && !hasRequestedMessage(item.folder, item.uid)
); );
if (message) { if (message) {
@ -886,7 +879,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
advancedSearchClick() { advancedSearchClick() {
Settings.capa(Capa.SearchAdv) Settings.capa(Capa.SearchAdv)
&& showScreenPopup(AdvancedSearchPopupView, [this.mainMessageListSearch()]); && showScreenPopup(AdvancedSearchPopupView, [MessageUserStore.mainMessageListSearch()]);
} }
quotaTooltip() { quotaTooltip() {

5
dev/View/User/MailBox/MessageView.js
View file

@ -71,8 +71,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
moreDropdownTrigger: false moreDropdownTrigger: false
}); });
this.pswp = null;
this.moveAction = moveAction; this.moveAction = moveAction;
this.allowComposer = Settings.capa(Capa.Composer); this.allowComposer = Settings.capa(Capa.Composer);
@ -84,7 +82,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
this.message = MessageUserStore.message; this.message = MessageUserStore.message;
this.hasCheckedMessages = MessageUserStore.hasCheckedMessages; this.hasCheckedMessages = MessageUserStore.hasCheckedMessages;
this.messageListCheckedOrSelectedUidsWithSubMails = MessageUserStore.listCheckedOrSelectedUidsWithSubMails;
this.messageLoadingThrottle = MessageUserStore.messageLoading; this.messageLoadingThrottle = MessageUserStore.messageLoading;
this.messagesBodiesDom = MessageUserStore.messagesBodiesDom; this.messagesBodiesDom = MessageUserStore.messagesBodiesDom;
this.useThreads = SettingsUserStore.useThreads; this.useThreads = SettingsUserStore.useThreads;
@ -717,7 +714,7 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
* @returns {string} * @returns {string}
*/ */
printableCheckedMessageCount() { printableCheckedMessageCount() {
const cnt = this.messageListCheckedOrSelectedUidsWithSubMails().length; const cnt = MessageUserStore.listCheckedOrSelectedUidsWithSubMails().length;
return 0 < cnt ? (100 > cnt ? cnt : '99+') : ''; return 0 < cnt ? (100 > cnt ? cnt : '99+') : '';
} }

2
snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -158,8 +158,6 @@ class ImapClient extends \MailSo\Net\NetClient
$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($sLogin)); $sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($sLogin));
$sPassword = $sPassword;
$this->sLogginedUser = $sLogin; $this->sLogginedUser = $sLogin;
// $encrypted = !empty(\stream_get_meta_data($this->rConnect)['crypto']); // $encrypted = !empty(\stream_get_meta_data($this->rConnect)['crypto']);