Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-01 05:29:20 +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

12
dev/Remote/AbstractAjax.js
View file

@ -4,7 +4,6 @@ import { pInt, pString } from 'Common/Utils';
import { data as GlobalsData } from 'Common/Globals';
import { ajax } from 'Common/Links';
import * as Settings from 'Storage/Settings';
class AbstractAjaxRemote {
constructor() {
@ -67,8 +66,8 @@ class AbstractAjaxRemote {
}
if (oData.ClearAuth || oData.Logout || AJAX_ERROR_LIMIT < GlobalsData.iAjaxErrorCount) {
if (GlobalsData.__APP__ && GlobalsData.__APP__.clearClientSideToken) {
GlobalsData.__APP__.clearClientSideToken();
if (GlobalsData.__APP__) {
rl.hash.clear();
if (!oData.ClearAuth && GlobalsData.__APP__.loginAndLogoutReload) {
GlobalsData.__APP__.loginAndLogoutReload(false, true);
@ -140,7 +139,7 @@ class AbstractAjaxRemote {
// '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) => {
@ -175,9 +174,8 @@ class AbstractAjaxRemote {
}
if (oData && oData.UpdateToken) {
if (GlobalsData.__APP__ && GlobalsData.__APP__.setClientSideToken) {
GlobalsData.__APP__.setClientSideToken(oData.UpdateToken);
}
rl.hash.set();
rl.settings.set('AuthAccountHash', oData.UpdateToken);
}
let sType = 'success';

12
dev/Remote/User/Ajax.js
View file

@ -17,7 +17,6 @@ import {
} from 'Common/Cache';
import { subQueryPrefix } from 'Common/Links';
import * as Settings from 'Storage/Settings';
import AppStore from 'Stores/User/App';
import SettingsStore from 'Stores/User/Settings';
@ -44,15 +43,16 @@ class RemoteUserAjax extends AbstractAjaxRemote {
* @param {?Function} fCallback
*/
folders(fCallback) {
const settingsGet = rl.settings.get;
this.defaultRequest(
fCallback,
'Folders',
{
SentFolder: Settings.settingsGet('SentFolder'),
DraftFolder: Settings.settingsGet('DraftFolder'),
SpamFolder: Settings.settingsGet('SpamFolder'),
TrashFolder: Settings.settingsGet('TrashFolder'),
ArchiveFolder: Settings.settingsGet('ArchiveFolder')
SentFolder: settingsGet('SentFolder'),
DraftFolder: settingsGet('DraftFolder'),
SpamFolder: settingsGet('SpamFolder'),
TrashFolder: settingsGet('TrashFolder'),
ArchiveFolder: settingsGet('ArchiveFolder')
},
null,
'',