Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-10 15:08:28 +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

8
dev/Model/Attachment.js
View file

@ -8,7 +8,7 @@ import {
import { AbstractModel } from 'Knoin/AbstractModel';
import Audio from 'Common/Audio';
import { SMAudio } from 'Common/Audio';
const bAllowPdfPreview = undefined !== navigator.mimeTypes['application/pdf'];
@ -120,9 +120,9 @@ export class AttachmentModel extends AbstractModel {
*/
hasPreplay() {
return (
(Audio.supportedMp3 && this.isMp3()) ||
(Audio.supportedOgg && this.isOgg()) ||
(Audio.supportedWav && this.isWav())
(SMAudio.supportedMp3 && this.isMp3()) ||
(SMAudio.supportedOgg && this.isOgg()) ||
(SMAudio.supportedWav && this.isWav())
);
}

4
dev/Model/Filter.js
View file

@ -5,7 +5,7 @@ import { delegateRunOnDestroy } from 'Common/UtilsUser';
import { i18n } from 'Common/Translator';
import { getFolderFromCacheList } from 'Common/Cache';
import AccountStore from 'Stores/User/Account';
import { AccountUserStore } from 'Stores/User/Account';
import { FilterConditionModel } from 'Model/FilterCondition';
import { AbstractModel } from 'Knoin/AbstractModel';
@ -215,7 +215,7 @@ export class FilterModel extends AbstractModel {
}
setRecipients() {
this.actionValueFourth(AccountStore.getEmailAddresses().join(', '));
this.actionValueFourth(AccountUserStore.getEmailAddresses().join(', '));
}
/**

34
dev/Model/FolderCollection.js
View file

@ -8,8 +8,8 @@ import { Settings, SettingsGet } from 'Common/Globals';
import * as Local from 'Storage/Client';
import AppStore from 'Stores/User/App';
import FolderStore from 'Stores/User/Folder';
import { AppUserStore } from 'Stores/User/App';
import { FolderUserStore } from 'Stores/User/Folder';
import ko from 'ko';
@ -102,17 +102,17 @@ export class FolderCollectionModel extends AbstractCollectionModel
let limit = pInt(Settings.app('folderSpecLimit'));
limit = 100 < limit ? 100 : 10 > limit ? 10 : limit;
FolderStore.displaySpecSetting(0 >= cnt || limit < cnt);
FolderUserStore.displaySpecSetting(0 >= cnt || limit < cnt);
FolderStore.folderList(this);
FolderUserStore.folderList(this);
if (undefined !== this.Namespace) {
FolderStore.namespace = this.Namespace;
FolderUserStore.namespace = this.Namespace;
}
AppStore.threadsAllowed(!!(Settings.app('useImapThread') && this.IsThreadsSupported));
AppUserStore.threadsAllowed(!!(Settings.app('useImapThread') && this.IsThreadsSupported));
FolderStore.folderListOptimized(!!this.Optimized);
FolderUserStore.folderListOptimized(!!this.Optimized);
let update = false;
@ -135,19 +135,19 @@ export class FolderCollectionModel extends AbstractCollectionModel
update = true;
}
FolderStore.sentFolder(normalizeFolder(SettingsGet('SentFolder')));
FolderStore.draftFolder(normalizeFolder(SettingsGet('DraftFolder')));
FolderStore.spamFolder(normalizeFolder(SettingsGet('SpamFolder')));
FolderStore.trashFolder(normalizeFolder(SettingsGet('TrashFolder')));
FolderStore.archiveFolder(normalizeFolder(SettingsGet('ArchiveFolder')));
FolderUserStore.sentFolder(normalizeFolder(SettingsGet('SentFolder')));
FolderUserStore.draftFolder(normalizeFolder(SettingsGet('DraftFolder')));
FolderUserStore.spamFolder(normalizeFolder(SettingsGet('SpamFolder')));
FolderUserStore.trashFolder(normalizeFolder(SettingsGet('TrashFolder')));
FolderUserStore.archiveFolder(normalizeFolder(SettingsGet('ArchiveFolder')));
if (update) {
rl.app.Remote.saveSystemFolders(()=>{}, {
SentFolder: FolderStore.sentFolder(),
DraftFolder: FolderStore.draftFolder(),
SpamFolder: FolderStore.spamFolder(),
TrashFolder: FolderStore.trashFolder(),
ArchiveFolder: FolderStore.archiveFolder(),
SentFolder: FolderUserStore.sentFolder(),
DraftFolder: FolderUserStore.draftFolder(),
SpamFolder: FolderUserStore.spamFolder(),
TrashFolder: FolderUserStore.trashFolder(),
ArchiveFolder: FolderUserStore.archiveFolder(),
NullFolder: 'NullFolder'
});
}

4
dev/Model/Message.js
View file

@ -8,7 +8,7 @@ import { isArray } from 'Common/Utils';
import { serverRequestRaw } from 'Common/Links';
import FolderStore from 'Stores/User/Folder';
import { FolderUserStore } from 'Stores/User/Folder';
import { FileInfo } from 'Common/File';
import { AttachmentCollectionModel } from 'Model/AttachmentCollection';
@ -173,7 +173,7 @@ export class MessageModel extends AbstractModel {
}
computeSenderEmail() {
const list = [FolderStore.sentFolder(), FolderStore.draftFolder()].includes(this.folder) ? 'to' : 'from';
const list = [FolderUserStore.sentFolder(), FolderUserStore.draftFolder()].includes(this.folder) ? 'to' : 'from';
this.senderEmailsString(this[list].toString(true));
this.senderClearEmailsString(this[list].toStringClear());
}

4
dev/Model/OpenPgpKey.js
View file

@ -2,7 +2,7 @@ import ko from 'ko';
import { AbstractModel } from 'Knoin/AbstractModel';
import PgpStore from 'Stores/User/Pgp';
import { PgpUserStore } from 'Stores/User/Pgp';
export class OpenPgpKeyModel extends AbstractModel {
/**
@ -38,7 +38,7 @@ export class OpenPgpKeyModel extends AbstractModel {
getNativeKey() {
let key = null;
try {
key = PgpStore.openpgp.key.readArmored(this.armor);
key = PgpUserStore.openpgp.key.readArmored(this.armor);
if (key && !key.err && key.keys && key.keys[0]) {
return key;
}