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

jshint -> eslint

Browse source
This commit is contained in:
RainLoop Team 2016-06-27 23:54:38 +03:00
parent 40b3f929e9
commit 77a1d3f3df
100 changed files with 716 additions and 811 deletions
Download patch file Download diff file Expand all files Collapse all files

32
dev/Promises/AbstractAjax.js
View file

@ -71,7 +71,7 @@
if (bPost)
{
oParameters['XToken'] = Settings.appSettingsGet('token');
oParameters.XToken = Settings.appSettingsGet('token');
}
Plugins.runHook('ajax-default-request', [sAction, oParameters, sAdditionalGetString]);
@ -79,19 +79,19 @@
self.setTrigger(fTrigger, true);
oH = $.ajax({
'type': bPost ? 'POST' : 'GET',
'url': Links.ajax(sAdditionalGetString),
'async': true,
'dataType': 'json',
'data': bPost ? (oParameters || {}) : {},
'timeout': iTimeOut,
'global': true
type: bPost ? 'POST' : 'GET',
url: Links.ajax(sAdditionalGetString),
async: true,
dataType: 'json',
data: bPost ? (oParameters || {}) : {},
timeout: iTimeOut,
global: true
}).always(function (oData, sTextStatus) {
var bCached = false, oErrorData = null, sType = Enums.StorageResultType.Error;
if (oData && oData['Time'])
if (oData && oData.Time)
{
bCached = Utils.pInt(oData['Time']) > Utils.microtime() - iStart;
bCached = Utils.pInt(oData.Time) > Utils.microtime() - iStart;
}
// backward capability
@ -172,7 +172,7 @@
{
if (Globals.data.__APP__ && Globals.data.__APP__.loginAndLogoutReload)
{
Globals.data.__APP__.loginAndLogoutReload(false, true);
Globals.data.__APP__.loginAndLogoutReload(false, true);
}
}
@ -213,14 +213,14 @@
return this.ajaxRequest(sAction, false, iTimeOut, null, sAdditionalGetString, fTrigger);
};
AbstractAjaxPromises.prototype.postRequest = function (sAction, fTrigger, oParameters, iTimeOut)
AbstractAjaxPromises.prototype.postRequest = function (action, fTrigger, params, timeOut)
{
oParameters = oParameters || {};
oParameters['Action'] = sAction;
params = params || {};
params.Action = action;
return this.ajaxRequest(sAction, true, iTimeOut, oParameters, '', fTrigger);
return this.ajaxRequest(action, true, timeOut, params, '', fTrigger);
};
module.exports = AbstractAjaxPromises;
}());
}());

2
dev/Promises/AbstractBasic.js
View file

@ -49,4 +49,4 @@
module.exports = AbstractBasicPromises;
}());
}());

2
dev/Promises/User/Ajax.js
View file

@ -91,4 +91,4 @@
module.exports = new UserAjaxUserPromises();
}());
}());

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

@ -119,7 +119,7 @@
}
}
aSubFolders = oFolder['SubFolders'];
aSubFolders = oFolder.SubFolders;
if (aSubFolders && 'Collection/FolderCollection' === aSubFolders['@Object'] &&
aSubFolders['@Collection'] && Utils.isArray(aSubFolders['@Collection']))
{
@ -142,7 +142,7 @@
{
var
iLimit = Utils.pInt(Settings.appSettingsGet('folderSpecLimit')),
iC = Utils.pInt(oData['CountRec'])
iC = Utils.pInt(oData.CountRec)
;
iLimit = 100 < iLimit ? 100 : (10 > iLimit ? 10 : iLimit);
@ -169,7 +169,7 @@
var bUpdate = false;
if (oData['SystemFolders'] && '' === '' +
if (oData.SystemFolders && '' === '' +
Settings.settingsGet('SentFolder') +
Settings.settingsGet('DraftFolder') +
Settings.settingsGet('SpamFolder') +
@ -177,11 +177,11 @@
Settings.settingsGet('ArchiveFolder') +
Settings.settingsGet('NullFolder'))
{
Settings.settingsSet('SentFolder', oData['SystemFolders'][Enums.ServerFolderType.SENT] || null);
Settings.settingsSet('DraftFolder', oData['SystemFolders'][Enums.ServerFolderType.DRAFTS] || null);
Settings.settingsSet('SpamFolder', oData['SystemFolders'][Enums.ServerFolderType.JUNK] || null);
Settings.settingsSet('TrashFolder', oData['SystemFolders'][Enums.ServerFolderType.TRASH] || null);
Settings.settingsSet('ArchiveFolder', oData['SystemFolders'][Enums.ServerFolderType.ALL] || null);
Settings.settingsSet('SentFolder', oData.SystemFolders[Enums.ServerFolderType.SENT] || null);
Settings.settingsSet('DraftFolder', oData.SystemFolders[Enums.ServerFolderType.DRAFTS] || null);
Settings.settingsSet('SpamFolder', oData.SystemFolders[Enums.ServerFolderType.JUNK] || null);
Settings.settingsSet('TrashFolder', oData.SystemFolders[Enums.ServerFolderType.TRASH] || null);
Settings.settingsSet('ArchiveFolder', oData.SystemFolders[Enums.ServerFolderType.ALL] || null);
bUpdate = true;
}
@ -195,12 +195,12 @@
if (bUpdate)
{
require('Remote/User/Ajax').saveSystemFolders(Utils.noop, {
'SentFolder': FolderStore.sentFolder(),
'DraftFolder': FolderStore.draftFolder(),
'SpamFolder': FolderStore.spamFolder(),
'TrashFolder': FolderStore.trashFolder(),
'ArchiveFolder': FolderStore.archiveFolder(),
'NullFolder': 'NullFolder'
SentFolder: FolderStore.sentFolder(),
DraftFolder: FolderStore.draftFolder(),
SpamFolder: FolderStore.spamFolder(),
TrashFolder: FolderStore.trashFolder(),
ArchiveFolder: FolderStore.archiveFolder(),
NullFolder: 'NullFolder'
});
}
@ -210,4 +210,4 @@
module.exports = new PromisesUserPopulator();
}());
}());