Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert user stores to single object instances

Browse source 
Removed unused ContactUserStore.exportingCsv and ContactUserStore.exportingVcf
This commit is contained in:
djmaze 2021-03-10 22:41:35 +01:00
parent 914c6e8d14
commit 6a454ec624
46 changed files with 671 additions and 710 deletions
Download patch file Download diff file Expand all files Collapse all files

36
dev/Screen/User/MailBox.js
View file

@ -4,11 +4,11 @@ import { pString, pInt } from 'Common/Utils';
import { getFolderFromCacheList, getFolderFullNameRaw, getFolderInboxName } from 'Common/Cache';
import { i18n } from 'Common/Translator';
import AppStore from 'Stores/User/App';
import AccountStore from 'Stores/User/Account';
import SettingsStore from 'Stores/User/Settings';
import FolderStore from 'Stores/User/Folder';
import MessageStore from 'Stores/User/Message';
import { AppUserStore } from 'Stores/User/App';
import { AccountUserStore } from 'Stores/User/Account';
import { SettingsUserStore } from 'Stores/User/Settings';
import { FolderUserStore } from 'Stores/User/Folder';
import { MessageUserStore } from 'Stores/User/Message';
import { ThemeStore } from 'Stores/Theme';
import { SystemDropDownMailBoxUserView } from 'View/User/MailBox/SystemDropDown';
@ -36,12 +36,12 @@ export class MailBoxUserScreen extends AbstractScreen {
* @returns {void}
*/
updateWindowTitle() {
const foldersInboxUnreadCount = Settings.app('listPermanentFiltered') ? 0 : FolderStore.foldersInboxUnreadCount(),
email = AccountStore.email();
const count = Settings.app('listPermanentFiltered') ? 0 : FolderUserStore.foldersInboxUnreadCount(),
email = AccountUserStore.email();
rl.setWindowTitle(
(email
? '' + (0 < foldersInboxUnreadCount ? '(' + foldersInboxUnreadCount + ') ' : ' ') + email + ' - '
? '' + (0 < count ? '(' + count + ') ' : ' ') + email + ' - '
: ''
) + i18n('TITLES/MAILBOX')
);
@ -53,8 +53,8 @@ export class MailBoxUserScreen extends AbstractScreen {
onShow() {
this.updateWindowTitle();
AppStore.focusedState(Focused.None);
AppStore.focusedState(Focused.MessageList);
AppUserStore.focusedState(Focused.None);
AppUserStore.focusedState(Focused.MessageList);
ThemeStore.isMobile() && leftPanelDisabled(true);
}
@ -73,11 +73,11 @@ export class MailBoxUserScreen extends AbstractScreen {
threadUid = '';
}
FolderStore.currentFolder(folder);
FolderUserStore.currentFolder(folder);
MessageStore.messageListPage(page);
MessageStore.messageListSearch(search);
MessageStore.messageListThreadUid(threadUid);
MessageUserStore.messageListPage(page);
MessageUserStore.messageListSearch(search);
MessageUserStore.messageListThreadUid(threadUid);
rl.app.reloadMessageList();
}
@ -89,14 +89,14 @@ export class MailBoxUserScreen extends AbstractScreen {
onStart() {
if (!this.__started) {
super.onStart();
setTimeout(() => SettingsStore.layout.valueHasMutated(), 50);
setTimeout(() => SettingsUserStore.layout.valueHasMutated(), 50);
setTimeout(() => warmUpScreenPopup(ComposePopupView), 500);
addEventListener('mailbox.inbox-unread-count', e => {
FolderStore.foldersInboxUnreadCount(e.detail);
FolderUserStore.foldersInboxUnreadCount(e.detail);
const email = AccountStore.email();
AccountStore.accounts.forEach(item =>
const email = AccountUserStore.email();
AccountUserStore.accounts.forEach(item =>
item && email === item.email && item.count(e.detail)
);

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

@ -3,8 +3,8 @@ import { keyScope, leftPanelDisabled, Settings } from 'Common/Globals';
import { runSettingsViewModelHooks } from 'Common/Plugins';
import { initOnStartOrLangChange, i18n } from 'Common/Translator';
import AppStore from 'Stores/User/App';
import AccountStore from 'Stores/User/Account';
import { AppUserStore } from 'Stores/User/App';
import { AccountUserStore } from 'Stores/User/Account';
import { ThemeStore } from 'Stores/Theme';
import { AbstractSettingsScreen, settingsAddViewModel } from 'Screen/AbstractSettings';
@ -45,7 +45,7 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
settingsAddViewModel(GeneralUserSettings, 'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
if (AppStore.contactsIsAllowed()) {
if (AppUserStore.contactsIsAllowed()) {
settingsAddViewModel(ContactsUserSettings, 'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
@ -101,7 +101,7 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
}
setSettingsTitle() {
const sEmail = AccountStore.email();
const sEmail = AccountUserStore.email();
rl.setWindowTitle((sEmail ? sEmail + ' - ' : '') + this.sSettingsTitle);
}
}