Code refactoring

This commit is contained in:
RainLoop Team 2015-02-22 20:35:17 +04:00
parent 31860420cb
commit 4eaef23cc7
52 changed files with 99 additions and 103 deletions

View file

@ -21,7 +21,7 @@
LicenseStore = require('Stores/Admin/License'),
PackageStore = require('Stores/Admin/Package'),
CoreStore = require('Stores/Admin/Core'),
Remote = require('Storage/Admin/Remote'),
Remote = require('Remote/Admin/Ajax'),
kn = require('Knoin/Knoin'),
AbstractApp = require('App/Abstract')

View file

@ -21,6 +21,8 @@
kn = require('Knoin/Knoin'),
Cache = require('Common/Cache'),
SocialStore = require('Stores/Social'),
AppStore = require('Stores/User/App'),
SettingsStore = require('Stores/User/Settings'),
@ -34,8 +36,8 @@
Local = require('Storage/Client'),
Settings = require('Storage/Settings'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
EmailModel = require('Model/Email'),
FolderModel = require('Model/Folder'),

View file

@ -11,7 +11,7 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
Cache = require('Storage/User/Cache'),
Cache = require('Common/Cache'),
FilterConditionModel = require('Model/FilterCondition'),

View file

@ -12,7 +12,7 @@
Events = require('Common/Events'),
Translator = require('Common/Translator'),
Cache = require('Storage/User/Cache'),
Cache = require('Common/Cache'),
AbstractModel = require('Knoin/AbstractModel')
;

View file

@ -21,12 +21,12 @@
/**
* @constructor
*/
function AbstractRemoteStorage()
function AbstractAjaxRemote()
{
this.oRequests = {};
}
AbstractRemoteStorage.prototype.oRequests = {};
AbstractAjaxRemote.prototype.oRequests = {};
/**
* @param {?Function} fCallback
@ -36,7 +36,7 @@
* @param {boolean} bCached
* @param {*=} oRequestParameters
*/
AbstractRemoteStorage.prototype.defaultResponse = function (fCallback, sRequestAction, sType, oData, bCached, oRequestParameters)
AbstractAjaxRemote.prototype.defaultResponse = function (fCallback, sRequestAction, sType, oData, bCached, oRequestParameters)
{
var
fCall = function () {
@ -134,7 +134,7 @@
* @param {Array=} aAbortActions = []
* @return {jQuery.jqXHR}
*/
AbstractRemoteStorage.prototype.ajaxRequest = function (fResultCallback, oParameters, iTimeOut, sGetAdd, aAbortActions)
AbstractAjaxRemote.prototype.ajaxRequest = function (fResultCallback, oParameters, iTimeOut, sGetAdd, aAbortActions)
{
var
self = this,
@ -230,7 +230,7 @@
* @param {string=} sGetAdd = ''
* @param {Array=} aAbortActions = []
*/
AbstractRemoteStorage.prototype.defaultRequest = function (fCallback, sAction, oParameters, iTimeout, sGetAdd, aAbortActions)
AbstractAjaxRemote.prototype.defaultRequest = function (fCallback, sAction, oParameters, iTimeout, sGetAdd, aAbortActions)
{
oParameters = oParameters || {};
oParameters.Action = sAction;
@ -246,7 +246,7 @@
/**
* @param {?Function} fCallback
*/
AbstractRemoteStorage.prototype.noop = function (fCallback)
AbstractAjaxRemote.prototype.noop = function (fCallback)
{
this.defaultRequest(fCallback, 'Noop');
};
@ -260,7 +260,7 @@
* @param {string} sHtmlCapa
* @param {number} iTime
*/
AbstractRemoteStorage.prototype.jsError = function (fCallback, sMessage, sFileName, iLineNo, sLocation, sHtmlCapa, iTime)
AbstractAjaxRemote.prototype.jsError = function (fCallback, sMessage, sFileName, iLineNo, sLocation, sHtmlCapa, iTime)
{
this.defaultRequest(fCallback, 'JsError', {
'Message': sMessage,
@ -278,7 +278,7 @@
* @param {Array=} mData = null
* @param {boolean=} bIsError = false
*/
AbstractRemoteStorage.prototype.jsInfo = function (fCallback, sType, mData, bIsError)
AbstractAjaxRemote.prototype.jsInfo = function (fCallback, sType, mData, bIsError)
{
this.defaultRequest(fCallback, 'JsInfo', {
'Type': sType,
@ -290,7 +290,7 @@
/**
* @param {?Function} fCallback
*/
AbstractRemoteStorage.prototype.getPublicKey = function (fCallback)
AbstractAjaxRemote.prototype.getPublicKey = function (fCallback)
{
this.defaultRequest(fCallback, 'GetPublicKey');
};
@ -299,13 +299,13 @@
* @param {?Function} fCallback
* @param {string} sVersion
*/
AbstractRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
AbstractAjaxRemote.prototype.jsVersion = function (fCallback, sVersion)
{
this.defaultRequest(fCallback, 'Version', {
'Version': sVersion
});
};
module.exports = AbstractRemoteStorage;
module.exports = AbstractAjaxRemote;
}());

View file

@ -6,21 +6,21 @@
var
_ = require('_'),
AbstractRemoteStorage = require('Storage/AbstractRemote')
AbstractAjaxRemote = require('Remote/AbstractAjax')
;
/**
* @constructor
* @extends AbstractRemoteStorage
* @extends AbstractAjaxRemote
*/
function RemoteAdminStorage()
{
AbstractRemoteStorage.call(this);
AbstractAjaxRemote.call(this);
this.oRequests = {};
}
_.extend(RemoteAdminStorage.prototype, AbstractRemoteStorage.prototype);
_.extend(RemoteAdminStorage.prototype, AbstractAjaxRemote.prototype);
/**
* @param {?Function} fCallback

View file

@ -10,14 +10,15 @@
Consts = require('Common/Consts'),
Base64 = require('Common/Base64'),
Cache = require('Common/Cache'),
Settings = require('Storage/Settings'),
AppStore = require('Stores/User/App'),
SettingsStore = require('Stores/User/Settings'),
MessageStore = require('Stores/User/Message'),
Settings = require('Storage/Settings'),
Cache = require('Storage/User/Cache'),
AbstractRemoteStorage = require('Storage/AbstractRemote')
AbstractAjaxRemote = require('Remote/AbstractAjax')
;
/**
@ -26,14 +27,14 @@
*/
function RemoteUserStorage()
{
AbstractRemoteStorage.call(this);
AbstractAjaxRemote.call(this);
this.oRequests = {};
this.sSubSubQuery = '&ss=/';
}
_.extend(RemoteUserStorage.prototype, AbstractRemoteStorage.prototype);
_.extend(RemoteUserStorage.prototype, AbstractAjaxRemote.prototype);
/**
* @param {?Function} fCallback
@ -619,12 +620,13 @@
* @param {(Array|null)} aDraftInfo
* @param {string} sInReplyTo
* @param {string} sReferences
* @param {boolean} bRequestDsn
* @param {boolean} bRequestReadReceipt
* @param {boolean} bMarkAsImportant
*/
RemoteUserStorage.prototype.sendMessage = function (fCallback, sIdentityID, sMessageFolder, sMessageUid, sSentFolder,
sTo, sCc, sBcc, sReplyTo, sSubject, bTextIsHtml, sText, aAttachments, aDraftInfo, sInReplyTo, sReferences,
bRequestReadReceipt, bMarkAsImportant)
bRequestDsn, bRequestReadReceipt, bMarkAsImportant)
{
this.defaultRequest(fCallback, 'SendMessage', {
'IdentityID': sIdentityID,
@ -641,6 +643,7 @@
'DraftInfo': aDraftInfo,
'InReplyTo': sInReplyTo,
'References': sReferences,
'Dsn': bRequestDsn ? '1' : '0',
'ReadReceiptRequest': bRequestReadReceipt ? '1' : '0',
'MarkAsImportant': bMarkAsImportant ? '1' : '0',
'Attachments': aAttachments

View file

@ -12,13 +12,13 @@
Events = require('Common/Events'),
Translator = require('Common/Translator'),
Cache = require('Common/Cache'),
AccountStore = require('Stores/User/Account'),
SettingsStore = require('Stores/User/Settings'),
FolderStore = require('Stores/User/Folder'),
MessageStore = require('Stores/User/Message'),
Cache = require('Storage/User/Cache'),
AbstractScreen = require('Knoin/AbstractScreen')
;

View file

@ -56,7 +56,7 @@
{
var
self = this,
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
_.delay(function () {

View file

@ -19,7 +19,7 @@
function ContactsAdminSettings()
{
var
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
@ -178,7 +178,7 @@
{
var
self = this,
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
_.delay(function () {

View file

@ -10,7 +10,7 @@
Enums = require('Common/Enums'),
DomainStore = require('Stores/Admin/Domain'),
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
/**

View file

@ -68,7 +68,7 @@
{
var
self = this,
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
_.delay(function () {

View file

@ -35,7 +35,7 @@
{
var
self = this,
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
_.delay(function () {

View file

@ -12,7 +12,7 @@
Translator = require('Common/Translator'),
PackageStore = require('Stores/Admin/Package'),
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
/**

View file

@ -13,7 +13,7 @@
Settings = require('Storage/Settings'),
PluginStore = require('Stores/Admin/Plugin'),
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
/**

View file

@ -15,7 +15,7 @@
CapaAdminStore = require('Stores/Admin/Capa'),
Settings = require('Storage/Settings'),
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
/**
@ -114,10 +114,6 @@
SecurityAdminSettings.prototype.onBuild = function ()
{
var
Remote = require('Storage/Admin/Remote')
;
this.capaOpenPGP.subscribe(function (bValue) {
Remote.saveAdminConfig(Utils.emptyFunction, {
'CapaOpenPGP': bValue ? '1' : '0'

View file

@ -59,7 +59,7 @@
{
var
self = this,
Remote = require('Storage/Admin/Remote')
Remote = require('Remote/Admin/Ajax')
;
_.delay(function () {

View file

@ -15,7 +15,7 @@
IdentityStore = require('Stores/User/Identity'),
Settings = require('Storage/Settings'),
Remote = require('Storage/User/Remote')
Remote = require('Remote/User/Ajax')
;
/**

View file

@ -11,7 +11,7 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
Remote = require('Storage/User/Remote')
Remote = require('Remote/User/Ajax')
;
/**

View file

@ -9,7 +9,7 @@
AppStore = require('Stores/User/App'),
ContactStore = require('Stores/User/Contact'),
Remote = require('Storage/User/Remote')
Remote = require('Remote/User/Ajax')
;
/**

View file

@ -13,7 +13,7 @@
FilterStore = require('Stores/User/Filter'),
Remote = require('Storage/User/Remote')
Remote = require('Remote/User/Ajax')
;
/**

View file

@ -10,12 +10,14 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
FolderStore = require('Stores/User/Folder'),
Cache = require('Common/Cache'),
Settings = require('Storage/Settings'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
Local = require('Storage/Client')
Local = require('Storage/Client'),
FolderStore = require('Stores/User/Folder'),
Remote = require('Remote/User/Ajax')
;
/**

View file

@ -19,7 +19,7 @@
NotificationStore = require('Stores/User/Notification'),
MessageStore = require('Stores/User/Message'),
Remote = require('Storage/User/Remote')
Remote = require('Remote/User/Ajax')
;
/**

View file

@ -15,7 +15,7 @@
Settings = require('Storage/Settings'),
Remote = require('Storage/User/Remote')
Remote = require('Remote/User/Ajax')
;
/**

View file

@ -10,7 +10,7 @@
TemplateStore = require('Stores/User/Template'),
Remote = require('Storage/User/Remote')
Remote = require('Remote/User/Ajax')
;
/**

View file

@ -18,7 +18,8 @@
ThemeStore = require('Stores/Theme'),
Settings = require('Storage/Settings'),
Remote = require('Storage/User/Remote')
Remote = require('Remote/User/Ajax')
;
/**

View file

@ -1,16 +0,0 @@
(function () {
'use strict';
/**
* @constructor
*/
function DataUserStorage()
{
}
module.exports = new DataUserStorage();
}());

View file

@ -13,7 +13,7 @@
Globals = require('Common/Globals'),
Utils = require('Common/Utils'),
Cache = require('Storage/User/Cache')
Cache = require('Common/Cache')
;
/**

View file

@ -19,12 +19,12 @@
Links = require('Common/Links'),
Translator = require('Common/Translator'),
Cache = require('Common/Cache'),
FolderStore = require('Stores/User/Folder'),
SettingsStore = require('Stores/User/Settings'),
MessageModel = require('Model/Message'),
Cache = require('Storage/User/Cache')
MessageModel = require('Model/Message')
;
/**

View file

@ -7,7 +7,7 @@
_ = require('_'),
ko = require('ko')
// Remote = require('Storage/User/Remote')
// Remote = require('Remote/User/Ajax')
;
/**

View file

@ -12,7 +12,7 @@
Translator = require('Common/Translator'),
Settings = require('Storage/Settings'),
Remote = require('Storage/Admin/Remote'),
Remote = require('Remote/Admin/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -8,7 +8,7 @@
ko = require('ko'),
Settings = require('Storage/Settings'),
Remote = require('Storage/Admin/Remote'),
Remote = require('Remote/Admin/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -11,7 +11,7 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -13,7 +13,7 @@
Translator = require('Common/Translator'),
Settings = require('Storage/Settings'),
Remote = require('Storage/Admin/Remote'),
Remote = require('Remote/Admin/Ajax'),
LicenseStore = require('Stores/Admin/License'),

View file

@ -21,6 +21,8 @@
HtmlEditor = require('Common/HtmlEditor'),
Translator = require('Common/Translator'),
Cache = require('Common/Cache'),
AppStore = require('Stores/User/App'),
SettingsStore = require('Stores/User/Settings'),
IdentityStore = require('Stores/User/Identity'),
@ -31,8 +33,7 @@
SocialStore = require('Stores/Social'),
Settings = require('Storage/Settings'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
ComposeAttachmentModel = require('Model/ComposeAttachment'),
@ -121,6 +122,7 @@
this.subject = ko.observable('');
this.isHtml = ko.observable(false);
this.requestDsn = ko.observable(false);
this.requestReadReceipt = ko.observable(false);
this.markAsImportant = ko.observable(false);
@ -366,6 +368,7 @@
this.aDraftInfo,
this.sInReplyTo,
this.sReferences,
this.requestDsn(),
this.requestReadReceipt(),
this.markAsImportant()
);
@ -2010,6 +2013,7 @@
this.replyTo('');
this.subject('');
this.requestDsn(false);
this.requestReadReceipt(false);
this.markAsImportant(false);

View file

@ -21,7 +21,7 @@
SettingsStore = require('Stores/User/Settings'),
ContactStore = require('Stores/User/Contact'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
EmailModel = require('Model/Email'),
ContactModel = require('Model/Contact'),

View file

@ -14,7 +14,7 @@
CapaAdminStore = require('Stores/Admin/Capa'),
Remote = require('Storage/Admin/Remote'),
Remote = require('Remote/Admin/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -11,10 +11,11 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
Cache = require('Common/Cache'),
MessageStore = require('Stores/User/Message'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -15,7 +15,7 @@
FolderStore = require('Stores/User/Folder'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -15,7 +15,7 @@
FolderStore = require('Stores/User/Folder'),
Settings = require('Storage/Settings'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -13,7 +13,7 @@
Translator = require('Common/Translator'),
HtmlEditor = require('Common/HtmlEditor'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -12,7 +12,7 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
Remote = require('Storage/Admin/Remote'),
Remote = require('Remote/Admin/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -12,7 +12,7 @@
Translator = require('Common/Translator'),
HtmlEditor = require('Common/HtmlEditor'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -11,7 +11,7 @@
Globals = require('Common/Globals'),
Utils = require('Common/Utils'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -22,7 +22,8 @@
Local = require('Storage/Client'),
Settings = require('Storage/Settings'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -351,7 +352,7 @@
{
case Enums.LoginSignMeTypeAsString.DefaultOff:
case Enums.LoginSignMeTypeAsString.DefaultOn:
this.signMeType(Enums.LoginSignMeTypeAsString.DefaultOn === sSignMe ?
Enums.LoginSignMeType.DefaultOn : Enums.LoginSignMeType.DefaultOff);

View file

@ -15,13 +15,13 @@
Globals = require('Common/Globals'),
Links = require('Common/Links'),
Cache = require('Common/Cache'),
AppStore = require('Stores/User/App'),
SettingsStore = require('Stores/User/Settings'),
FolderStore = require('Stores/User/Folder'),
MessageStore = require('Stores/User/Message'),
Cache = require('Storage/User/Cache'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
;

View file

@ -20,14 +20,15 @@
Selector = require('Common/Selector'),
Translator = require('Common/Translator'),
Cache = require('Common/Cache'),
QuotaStore = require('Stores/User/Quota'),
SettingsStore = require('Stores/User/Settings'),
FolderStore = require('Stores/User/Folder'),
MessageStore = require('Stores/User/Message'),
Settings = require('Storage/Settings'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -19,14 +19,15 @@
Events = require('Common/Events'),
Translator = require('Common/Translator'),
Cache = require('Common/Cache'),
SettingsStore = require('Stores/User/Settings'),
AccountStore = require('Stores/User/Account'),
FolderStore = require('Stores/User/Folder'),
MessageStore = require('Stores/User/Message'),
Local = require('Storage/Client'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -11,7 +11,7 @@
Globals = require('Common/Globals'),
Links = require('Common/Links'),
Cache = require('Storage/User/Cache'),
Cache = require('Common/Cache'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

View file

@ -32,7 +32,7 @@
PaneSettingsUserView.prototype.backToMailBoxClick = function ()
{
kn.setHash(require('Common/Links').inbox(
require('Storage/User/Cache').getFolderInboxName()));
require('Common/Cache').getFolderInboxName()));
};
module.exports = PaneSettingsUserView;

View file

@ -2,7 +2,7 @@
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.8.1",
"release": "266",
"release": "267",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "gulpfile.js",