Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-11 00:14:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

change AbstractFetchRemote with a better structure

Browse source
This commit is contained in:
djmaze 2021-12-02 23:15:24 +01:00
parent 0d809dd574
commit 792fee547a
26 changed files with 265 additions and 723 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dev/Settings/User/Accounts.js
View file

@ -54,14 +54,16 @@ export class AccountsUserSettings /*extends AbstractViewSettings*/ {
if (accountToRemove) {
this.accounts.remove((account) => accountToRemove === account);
Remote.accountDelete((iError, data) => {
Remote.request('AccountDelete', (iError, data) => {
if (!iError && data.Reload) {
rl.route.root();
setTimeout(() => location.reload(), 1);
} else {
rl.app.accountsAndIdentities();
}
}, accountToRemove.email);
}, {
EmailToDelete: accountToRemove.email
});
}
}
}
@ -76,16 +78,18 @@ export class AccountsUserSettings /*extends AbstractViewSettings*/ {
if (identityToRemove) {
IdentityUserStore.remove(oIdentity => identityToRemove === oIdentity);
Remote.identityDelete(() => rl.app.accountsAndIdentities(), identityToRemove.id());
Remote.request('IdentityDelete', () => rl.app.accountsAndIdentities(), {
IdToDelete: identityToRemove.id()
});
}
}
}
accountsAndIdentitiesAfterMove() {
Remote.accountsAndIdentitiesSortOrder(null,
AccountUserStore.getEmailAddresses().filter(v => v != SettingsGet('MainEmail')),
IdentityUserStore.getIDS()
);
Remote.request('AccountsAndIdentitiesSortOrder', null, {
Accounts: AccountUserStore.getEmailAddresses().filter(v => v != SettingsGet('MainEmail')),
Identities: IdentityUserStore.getIDS()
});
}
onBuild(oDom) {

13
dev/Settings/User/Contacts.js
View file

@ -32,13 +32,12 @@ export class ContactsUserSettings /*extends AbstractViewSettings*/ {
);
this.saveTrigger.subscribe(() =>
Remote.saveContactsSyncData(
null,
ContactUserStore.enableSync(),
ContactUserStore.syncUrl(),
ContactUserStore.syncUser(),
ContactUserStore.syncPass()
)
Remote.request('SaveContactsSyncData', null, {
Enable: ContactUserStore.enableSync() ? 1 : 0,
Url: ContactUserStore.syncUrl(),
User: ContactUserStore.syncUser(),
Password: ContactUserStore.syncPass()
})
);
}
}

10
dev/Settings/User/Filters.js
View file

@ -36,7 +36,7 @@ export class FiltersUserSettings /*extends AbstractViewSettings*/ {
this.loading(true);
this.serverError(false);
Remote.filtersGet((iError, data) => {
Remote.request('Filters', (iError, data) => {
this.loading(false);
this.scripts([]);
@ -69,7 +69,7 @@ export class FiltersUserSettings /*extends AbstractViewSettings*/ {
deleteScript(script) {
this.serverError(false);
Remote.filtersScriptDelete(
Remote.request('FiltersScriptDelete',
(iError, data) => {
if (iError) {
this.setError((data && data.ErrorMessageAdditional) || getNotification(iError));
@ -78,14 +78,14 @@ export class FiltersUserSettings /*extends AbstractViewSettings*/ {
delegateRunOnDestroy(script);
}
},
script.name()
{name:script.name()}
);
}
toggleScript(script) {
let name = script.active() ? '' : script.name();
this.serverError(false);
Remote.filtersScriptActivate(
Remote.request('FiltersScriptActivate',
(iError, data) => {
if (iError) {
this.setError((data && data.ErrorMessageAdditional) || iError)
@ -93,7 +93,7 @@ export class FiltersUserSettings /*extends AbstractViewSettings*/ {
this.scripts.forEach(script => script.active(script.name() === name));
}
},
name
{name:name}
);
}

21
dev/Settings/User/Folders.js
View file

@ -73,7 +73,10 @@ export class FoldersUserSettings /*extends AbstractViewSettings*/ {
Local.set(ClientSideKeyName.FoldersLashHash, '');
rl.app.foldersPromisesActionHelper(
Remote.folderRename(folder.fullName, nameToEdit),
Remote.post('FolderRename', FolderUserStore.foldersRenaming, {
Folder: folder.fullName,
NewFolderName: nameToEdit
}),
Notification.CantRenameFolder
);
@ -119,9 +122,9 @@ export class FoldersUserSettings /*extends AbstractViewSettings*/ {
Local.set(ClientSideKeyName.FoldersLashHash, '');
// rl.app.foldersPromisesActionHelper
Remote.abort('Folders')
.folderDelete(folderToRemove.fullName)
.then(
Remote.abort('Folders').post('FolderDelete', FolderUserStore.foldersDeleting, {
Folder: folderToRemove.fullName
}).then(
() => {
folderToRemove.selectable(false)
removeFolderFromCacheList(folderToRemove.fullName);
@ -150,13 +153,19 @@ export class FoldersUserSettings /*extends AbstractViewSettings*/ {
toggleFolderSubscription(folder) {
let subscribe = !folder.subscribed();
Local.set(ClientSideKeyName.FoldersLashHash, '');
Remote.folderSetSubscribe(null, folder.fullName, subscribe);
Remote.request('FolderSubscribe', null, {
Folder: folder.fullName,
Subscribe: subscribe ? 1 : 0
});
folder.subscribed(subscribe);
}
toggleFolderCheckable(folder) {
let checkable = !folder.checkable();
Remote.folderSetCheckable(null, folder.fullName, checkable);
Remote.request('FolderCheckable', null, {
Folder: folder.fullName,
Checkable: checkable ? 1 : 0
});
folder.checkable(checkable);
}
}

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

@ -108,7 +108,7 @@ export class ThemesUserSettings /*extends AbstractViewSettings*/ {
clearBackground() {
if (this.capaUserBackground()) {
Remote.clearUserBackground(() => {
Remote.request('ClearUserBackground', () => {
this.background.name('');
this.background.hash('');
});