Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-04 23:17:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved boot.js with existing global window.rl

Browse source 
Put dev/Storage/Settings.js in boots.js global rl.settings
This commit is contained in:
djmaze 2020-09-04 12:05:17 +02:00
parent f90dbcc84b
commit aeb5275648
57 changed files with 284 additions and 380 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dev/Promises/AbstractAjax.js
View file

@ -3,7 +3,6 @@ import { pInt, pString } from 'Common/Utils';
import { DEFAULT_AJAX_TIMEOUT, TOKEN_ERROR_LIMIT, AJAX_ERROR_LIMIT } from 'Common/Consts';
import { Notification } from 'Common/Enums';
import { data as GlobalsData } from 'Common/Globals';
import * as Settings from 'Storage/Settings';
import { AbstractBasicPromises } from 'Promises/AbstractBasic';
@ -51,7 +50,7 @@ class AbstractAjaxPromises extends AbstractBasicPromises {
// 'Content-Type': 'application/json'
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
};
params.XToken = Settings.appSettingsGet('token');
params.XToken = rl.settings.app('token');
// init.body = JSON.stringify(params);
const formData = new FormData(),
buildFormData = (formData, data, parentKey) => {
@ -86,8 +85,9 @@ class AbstractAjaxPromises extends AbstractBasicPromises {
return Promise.reject(Notification.AjaxParse);
}
if (data.UpdateToken && GlobalsData.__APP__ && GlobalsData.__APP__.setClientSideToken) {
GlobalsData.__APP__.setClientSideToken(data.UpdateToken);
if (data.UpdateToken) {
rl.hash.set();
rl.settings.set('AuthAccountHash', data.UpdateToken);
}
/*
@ -136,12 +136,12 @@ class AbstractAjaxPromises extends AbstractBasicPromises {
}
if (data.ClearAuth || data.Logout || AJAX_ERROR_LIMIT < GlobalsData.iAjaxErrorCount) {
if (GlobalsData.__APP__ && GlobalsData.__APP__.clearClientSideToken) {
GlobalsData.__APP__.clearClientSideToken();
}
if (GlobalsData.__APP__) {
rl.hash.clear();
if (GlobalsData.__APP__ && !data.ClearAuth && GlobalsData.__APP__.loginAndLogoutReload) {
GlobalsData.__APP__.loginAndLogoutReload(false, true);
if (!data.ClearAuth && GlobalsData.__APP__.loginAndLogoutReload) {
GlobalsData.__APP__.loginAndLogoutReload(false, true);
}
}
}

39
dev/Promises/User/Populator.js
View file

@ -3,7 +3,6 @@ import { pInt } from 'Common/Utils';
import { ClientSideKeyName, ServerFolderType } from 'Common/Enums';
import * as Cache from 'Common/Cache';
import * as Settings from 'Storage/Settings';
import * as Local from 'Storage/Client';
import AppStore from 'Stores/User/App';
@ -14,6 +13,8 @@ import Remote from 'Remote/User/Ajax';
import { FolderModel } from 'Model/Folder';
import { AbstractBasicPromises } from 'Promises/AbstractBasic';
const Settings = rl.settings;
class PromisesUserPopulator extends AbstractBasicPromises {
/**
* @param {string} sFullNameHash
@ -109,7 +110,7 @@ class PromisesUserPopulator extends AbstractBasicPromises {
const expandedFolders = Local.get(ClientSideKeyName.ExpandedFolders),
cnt = pInt(oData.CountRec);
let limit = pInt(Settings.appSettingsGet('folderSpecLimit'));
let limit = pInt(Settings.app('folderSpecLimit'));
limit = 100 < limit ? 100 : 10 > limit ? 10 : limit;
FolderStore.displaySpecSetting(0 >= cnt || limit < cnt);
@ -136,7 +137,7 @@ class PromisesUserPopulator extends AbstractBasicPromises {
FolderStore.namespace = oData.Namespace;
}
AppStore.threadsAllowed(!!Settings.appSettingsGet('useImapThread') && oData.IsThreadsSupported && true);
AppStore.threadsAllowed(!!Settings.app('useImapThread') && oData.IsThreadsSupported && true);
FolderStore.folderList.optimized(!!oData.Optimized);
@ -145,27 +146,27 @@ class PromisesUserPopulator extends AbstractBasicPromises {
if (
oData.SystemFolders &&
!('' +
Settings.settingsGet('SentFolder') +
Settings.settingsGet('DraftFolder') +
Settings.settingsGet('SpamFolder') +
Settings.settingsGet('TrashFolder') +
Settings.settingsGet('ArchiveFolder') +
Settings.settingsGet('NullFolder'))
Settings.get('SentFolder') +
Settings.get('DraftFolder') +
Settings.get('SpamFolder') +
Settings.get('TrashFolder') +
Settings.get('ArchiveFolder') +
Settings.get('NullFolder'))
) {
Settings.settingsSet('SentFolder', oData.SystemFolders[ServerFolderType.SENT] || null);
Settings.settingsSet('DraftFolder', oData.SystemFolders[ServerFolderType.DRAFTS] || null);
Settings.settingsSet('SpamFolder', oData.SystemFolders[ServerFolderType.JUNK] || null);
Settings.settingsSet('TrashFolder', oData.SystemFolders[ServerFolderType.TRASH] || null);
Settings.settingsSet('ArchiveFolder', oData.SystemFolders[ServerFolderType.ALL] || null);
Settings.set('SentFolder', oData.SystemFolders[ServerFolderType.SENT] || null);
Settings.set('DraftFolder', oData.SystemFolders[ServerFolderType.DRAFTS] || null);
Settings.set('SpamFolder', oData.SystemFolders[ServerFolderType.JUNK] || null);
Settings.set('TrashFolder', oData.SystemFolders[ServerFolderType.TRASH] || null);
Settings.set('ArchiveFolder', oData.SystemFolders[ServerFolderType.ALL] || null);
update = true;
}
FolderStore.sentFolder(this.normalizeFolder(Settings.settingsGet('SentFolder')));
FolderStore.draftFolder(this.normalizeFolder(Settings.settingsGet('DraftFolder')));
FolderStore.spamFolder(this.normalizeFolder(Settings.settingsGet('SpamFolder')));
FolderStore.trashFolder(this.normalizeFolder(Settings.settingsGet('TrashFolder')));
FolderStore.archiveFolder(this.normalizeFolder(Settings.settingsGet('ArchiveFolder')));
FolderStore.sentFolder(this.normalizeFolder(Settings.get('SentFolder')));
FolderStore.draftFolder(this.normalizeFolder(Settings.get('DraftFolder')));
FolderStore.spamFolder(this.normalizeFolder(Settings.get('SpamFolder')));
FolderStore.trashFolder(this.normalizeFolder(Settings.get('TrashFolder')));
FolderStore.archiveFolder(this.normalizeFolder(Settings.get('ArchiveFolder')));
if (update) {
Remote.saveSystemFolders(()=>{}, {