From 581c89d5023bf4a08a7b1d562ed724aa8b92e25b Mon Sep 17 00:00:00 2001 From: djmaze Date: Tue, 30 Mar 2021 11:48:22 +0200 Subject: [PATCH] Cleanup unused properties --- dev/Common/Links.js | 5 +- dev/View/User/MailBox/MessageList.js | 47 ++++++++----------- dev/View/User/MailBox/MessageView.js | 5 +- .../app/libraries/MailSo/Imap/ImapClient.php | 2 - 4 files changed, 24 insertions(+), 35 deletions(-) diff --git a/dev/Common/Links.js b/dev/Common/Links.js index 47928e239..c53d87b1d 100644 --- a/dev/Common/Links.js +++ b/dev/Common/Links.js @@ -179,12 +179,13 @@ export function mailBox(folder, page = 1, search = '', threadUid = '') { } if (1 < page) { - result = result.replace(/[/]+$/, '') + '/p' + page; + result = result.replace(/\/+$/, '') + '/p' + page; } if (search) { - result = result.replace(/[/]+$/, '') + '/' + encodeURI(search); + result = result.replace(/\/+$/, '') + '/' + encodeURI(search); } return result; } + diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index e5238ae75..f0824c5ac 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -71,7 +71,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight { this.message = MessageUserStore.message; this.messageList = MessageUserStore.list; - this.messageListDisableAutoSelect = MessageUserStore.listDisableAutoSelect; this.folderList = FolderUserStore.folderList; this.sortSupported = FolderUserStore.sortSupported; @@ -79,22 +78,16 @@ export class MessageListMailBoxUserView extends AbstractViewRight { this.composeInEdit = AppUserStore.composeInEdit; this.leftPanelDisabled = leftPanelDisabled; - this.selectorMessageSelected = MessageUserStore.selectorMessageSelected; - this.selectorMessageFocused = MessageUserStore.selectorMessageFocused; this.isMessageSelected = MessageUserStore.isMessageSelected; this.messageListSearch = MessageUserStore.listSearch; - this.messageListThreadUid = MessageUserStore.listThreadUid; this.messageListError = MessageUserStore.listError; this.folderMenuForMove = FolderUserStore.folderMenuForMove; this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList; - this.mainMessageListSearch = MessageUserStore.mainMessageListSearch; - this.messageListEndFolder = MessageUserStore.listEndFolder; this.messageListEndThreadUid = MessageUserStore.listEndThreadUid; this.messageListCheckedOrSelected = MessageUserStore.listCheckedOrSelected; - this.messageListCheckedOrSelectedUidsWithSubMails = MessageUserStore.listCheckedOrSelectedUidsWithSubMails; this.messageListCompleteLoadingThrottle = MessageUserStore.listCompleteLoading; this.messageListCompleteLoadingThrottleForAnimation = MessageUserStore.listLoadingAnimation; @@ -139,7 +132,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { }, inputProxyMessageListSearch: { - read: this.mainMessageListSearch, + read: MessageUserStore.mainMessageListSearch, write: value => this.sLastSearchValue = value }, @@ -148,19 +141,19 @@ export class MessageListMailBoxUserView extends AbstractViewRight { 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(), - 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(), @@ -197,9 +190,9 @@ export class MessageListMailBoxUserView extends AbstractViewRight { this.quotaTooltip = this.quotaTooltip.bind(this); this.selector = new Selector( - this.messageList, - this.selectorMessageSelected, - this.selectorMessageFocused, + MessageUserStore.list, + MessageUserStore.selectorMessageSelected, + MessageUserStore.selectorMessageFocused, '.messageListItem .actionHandle', '.messageListItem .checkboxMessage', '.messageListItem.focused' @@ -224,7 +217,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { addEventListener('mailbox.message.show', e => { 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 ); @@ -411,18 +404,18 @@ export class MessageListMailBoxUserView extends AbstractViewRight { } useAutoSelect() { - return !this.messageListDisableAutoSelect() - && !/is:unseen/.test(this.mainMessageListSearch()) + return !MessageUserStore.listDisableAutoSelect() + && !/is:unseen/.test(MessageUserStore.mainMessageListSearch()) && SettingsUserStore.usePreviewPane(); } searchEnterAction() { - this.mainMessageListSearch(this.sLastSearchValue); + MessageUserStore.mainMessageListSearch(this.sLastSearchValue); this.inputMessageListSearchFocus(false); } cancelSearch() { - this.mainMessageListSearch(''); + MessageUserStore.mainMessageListSearch(''); this.inputMessageListSearchFocus(false); } @@ -676,7 +669,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { !this.messageListSearchDesc() && !this.messageListError() && !this.messageListEndThreadUid() && - this.messageList.length && + MessageUserStore.list.length && (this.isSpamFolder() || this.isTrashFolder()) ); } @@ -776,9 +769,9 @@ export class MessageListMailBoxUserView extends AbstractViewRight { } shortcuts.add('t', '', [Scope.MessageList], () => { - let message = this.selectorMessageSelected(); + let message = MessageUserStore.selectorMessageSelected(); if (!message) { - message = this.selectorMessageFocused(); + message = MessageUserStore.selectorMessageFocused(); } if (message && 0 < message.threadsLen()) { @@ -861,7 +854,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { prefetchNextTick() { if (!this.bPrefetch && !ifvisible.now() && this.viewModelVisible) { - const message = this.messageList.find( + const message = MessageUserStore.list.find( item => item && !hasRequestedMessage(item.folder, item.uid) ); if (message) { @@ -886,7 +879,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { advancedSearchClick() { Settings.capa(Capa.SearchAdv) - && showScreenPopup(AdvancedSearchPopupView, [this.mainMessageListSearch()]); + && showScreenPopup(AdvancedSearchPopupView, [MessageUserStore.mainMessageListSearch()]); } quotaTooltip() { diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 939e0526b..ee1c6b610 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -71,8 +71,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight { moreDropdownTrigger: false }); - this.pswp = null; - this.moveAction = moveAction; this.allowComposer = Settings.capa(Capa.Composer); @@ -84,7 +82,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight { this.message = MessageUserStore.message; this.hasCheckedMessages = MessageUserStore.hasCheckedMessages; - this.messageListCheckedOrSelectedUidsWithSubMails = MessageUserStore.listCheckedOrSelectedUidsWithSubMails; this.messageLoadingThrottle = MessageUserStore.messageLoading; this.messagesBodiesDom = MessageUserStore.messagesBodiesDom; this.useThreads = SettingsUserStore.useThreads; @@ -717,7 +714,7 @@ class MessageViewMailBoxUserView extends AbstractViewRight { * @returns {string} */ printableCheckedMessageCount() { - const cnt = this.messageListCheckedOrSelectedUidsWithSubMails().length; + const cnt = MessageUserStore.listCheckedOrSelectedUidsWithSubMails().length; return 0 < cnt ? (100 > cnt ? cnt : '99+') : ''; } diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php index fa1a64084..2035deaaf 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php @@ -158,8 +158,6 @@ class ImapClient extends \MailSo\Net\NetClient $sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($sLogin)); - $sPassword = $sPassword; - $this->sLogginedUser = $sLogin; // $encrypted = !empty(\stream_get_meta_data($this->rConnect)['crypto']);