From 4eaef23cc72223056dc70cc9b87d3f18e9e6b637 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Sun, 22 Feb 2015 20:35:17 +0400 Subject: [PATCH] Code refactoring --- dev/App/Admin.js | 2 +- dev/App/User.js | 6 +++-- dev/{Storage/User => Common}/Cache.js | 0 dev/Model/Filter.js | 2 +- dev/Model/Folder.js | 2 +- .../AbstractAjax.js} | 22 +++++++++---------- .../Admin/Remote.js => Remote/Admin/Ajax.js} | 8 +++---- .../User/Remote.js => Remote/User/Ajax.js} | 17 ++++++++------ dev/Screen/User/MailBox.js | 4 ++-- dev/Settings/Admin/Branding.js | 2 +- dev/Settings/Admin/Contacts.js | 4 ++-- dev/Settings/Admin/Domains.js | 2 +- dev/Settings/Admin/General.js | 2 +- dev/Settings/Admin/Login.js | 2 +- dev/Settings/Admin/Packages.js | 2 +- dev/Settings/Admin/Plugins.js | 2 +- dev/Settings/Admin/Security.js | 6 +---- dev/Settings/Admin/Social.js | 2 +- dev/Settings/User/Accounts.js | 2 +- dev/Settings/User/ChangePassword.js | 2 +- dev/Settings/User/Contacts.js | 2 +- dev/Settings/User/Filters.js | 2 +- dev/Settings/User/Folders.js | 10 +++++---- dev/Settings/User/General.js | 2 +- dev/Settings/User/Security.js | 2 +- dev/Settings/User/Templates.js | 2 +- dev/Settings/User/Themes.js | 3 ++- dev/Storage/User/Data.js | 16 -------------- dev/Stores/User/Folder.js | 2 +- dev/Stores/User/Message.js | 6 ++--- dev/Stores/User/Template.js | 2 +- dev/View/Admin/Login.js | 2 +- dev/View/Admin/Settings/Pane.js | 2 +- dev/View/Popup/Account.js | 2 +- dev/View/Popup/Activate.js | 2 +- dev/View/Popup/Compose.js | 8 +++++-- dev/View/Popup/Contacts.js | 2 +- dev/View/Popup/Domain.js | 2 +- dev/View/Popup/FolderClear.js | 5 +++-- dev/View/Popup/FolderCreate.js | 2 +- dev/View/Popup/FolderSystem.js | 2 +- dev/View/Popup/Identity.js | 2 +- dev/View/Popup/Plugin.js | 2 +- dev/View/Popup/Template.js | 2 +- dev/View/Popup/TwoFactorTest.js | 2 +- dev/View/User/Login.js | 5 +++-- dev/View/User/MailBox/FolderList.js | 4 ++-- dev/View/User/MailBox/MessageList.js | 5 +++-- dev/View/User/MailBox/MessageView.js | 5 +++-- dev/View/User/Settings/Menu.js | 2 +- dev/View/User/Settings/Pane.js | 2 +- package.json | 2 +- 52 files changed, 99 insertions(+), 103 deletions(-) rename dev/{Storage/User => Common}/Cache.js (100%) rename dev/{Storage/AbstractRemote.js => Remote/AbstractAjax.js} (87%) rename dev/{Storage/Admin/Remote.js => Remote/Admin/Ajax.js} (96%) rename dev/{Storage/User/Remote.js => Remote/User/Ajax.js} (98%) delete mode 100644 dev/Storage/User/Data.js diff --git a/dev/App/Admin.js b/dev/App/Admin.js index 8995d0448..872b165af 100644 --- a/dev/App/Admin.js +++ b/dev/App/Admin.js @@ -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') diff --git a/dev/App/User.js b/dev/App/User.js index 075deffb7..f0eb9cb8c 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -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'), diff --git a/dev/Storage/User/Cache.js b/dev/Common/Cache.js similarity index 100% rename from dev/Storage/User/Cache.js rename to dev/Common/Cache.js diff --git a/dev/Model/Filter.js b/dev/Model/Filter.js index e72a0f1f8..e919427d0 100644 --- a/dev/Model/Filter.js +++ b/dev/Model/Filter.js @@ -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'), diff --git a/dev/Model/Folder.js b/dev/Model/Folder.js index abd6b489f..668fec202 100644 --- a/dev/Model/Folder.js +++ b/dev/Model/Folder.js @@ -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') ; diff --git a/dev/Storage/AbstractRemote.js b/dev/Remote/AbstractAjax.js similarity index 87% rename from dev/Storage/AbstractRemote.js rename to dev/Remote/AbstractAjax.js index eacf1a39f..b4a22123f 100644 --- a/dev/Storage/AbstractRemote.js +++ b/dev/Remote/AbstractAjax.js @@ -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; }()); \ No newline at end of file diff --git a/dev/Storage/Admin/Remote.js b/dev/Remote/Admin/Ajax.js similarity index 96% rename from dev/Storage/Admin/Remote.js rename to dev/Remote/Admin/Ajax.js index 9c987b30c..5173daeb0 100644 --- a/dev/Storage/Admin/Remote.js +++ b/dev/Remote/Admin/Ajax.js @@ -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 diff --git a/dev/Storage/User/Remote.js b/dev/Remote/User/Ajax.js similarity index 98% rename from dev/Storage/User/Remote.js rename to dev/Remote/User/Ajax.js index 891c98474..2819f569c 100644 --- a/dev/Storage/User/Remote.js +++ b/dev/Remote/User/Ajax.js @@ -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 diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js index f690b1446..50f20bcaf 100644 --- a/dev/Screen/User/MailBox.js +++ b/dev/Screen/User/MailBox.js @@ -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') ; diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js index 68f8d3d77..91c0a4ee1 100644 --- a/dev/Settings/Admin/Branding.js +++ b/dev/Settings/Admin/Branding.js @@ -56,7 +56,7 @@ { var self = this, - Remote = require('Storage/Admin/Remote') + Remote = require('Remote/Admin/Ajax') ; _.delay(function () { diff --git a/dev/Settings/Admin/Contacts.js b/dev/Settings/Admin/Contacts.js index 9b82d14e6..8d0313d09 100644 --- a/dev/Settings/Admin/Contacts.js +++ b/dev/Settings/Admin/Contacts.js @@ -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 () { diff --git a/dev/Settings/Admin/Domains.js b/dev/Settings/Admin/Domains.js index 352c90cc1..6fe36c033 100644 --- a/dev/Settings/Admin/Domains.js +++ b/dev/Settings/Admin/Domains.js @@ -10,7 +10,7 @@ Enums = require('Common/Enums'), DomainStore = require('Stores/Admin/Domain'), - Remote = require('Storage/Admin/Remote') + Remote = require('Remote/Admin/Ajax') ; /** diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js index 5e80bfb4b..5268d8559 100644 --- a/dev/Settings/Admin/General.js +++ b/dev/Settings/Admin/General.js @@ -68,7 +68,7 @@ { var self = this, - Remote = require('Storage/Admin/Remote') + Remote = require('Remote/Admin/Ajax') ; _.delay(function () { diff --git a/dev/Settings/Admin/Login.js b/dev/Settings/Admin/Login.js index 908aecfdb..c98fc3b1c 100644 --- a/dev/Settings/Admin/Login.js +++ b/dev/Settings/Admin/Login.js @@ -35,7 +35,7 @@ { var self = this, - Remote = require('Storage/Admin/Remote') + Remote = require('Remote/Admin/Ajax') ; _.delay(function () { diff --git a/dev/Settings/Admin/Packages.js b/dev/Settings/Admin/Packages.js index 8947f357b..f901f3b01 100644 --- a/dev/Settings/Admin/Packages.js +++ b/dev/Settings/Admin/Packages.js @@ -12,7 +12,7 @@ Translator = require('Common/Translator'), PackageStore = require('Stores/Admin/Package'), - Remote = require('Storage/Admin/Remote') + Remote = require('Remote/Admin/Ajax') ; /** diff --git a/dev/Settings/Admin/Plugins.js b/dev/Settings/Admin/Plugins.js index a83db3c9c..f15c7637c 100644 --- a/dev/Settings/Admin/Plugins.js +++ b/dev/Settings/Admin/Plugins.js @@ -13,7 +13,7 @@ Settings = require('Storage/Settings'), PluginStore = require('Stores/Admin/Plugin'), - Remote = require('Storage/Admin/Remote') + Remote = require('Remote/Admin/Ajax') ; /** diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js index 5f7d43b6e..9d0ac8cd0 100644 --- a/dev/Settings/Admin/Security.js +++ b/dev/Settings/Admin/Security.js @@ -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' diff --git a/dev/Settings/Admin/Social.js b/dev/Settings/Admin/Social.js index 4faf782d8..ca2d2ad84 100644 --- a/dev/Settings/Admin/Social.js +++ b/dev/Settings/Admin/Social.js @@ -59,7 +59,7 @@ { var self = this, - Remote = require('Storage/Admin/Remote') + Remote = require('Remote/Admin/Ajax') ; _.delay(function () { diff --git a/dev/Settings/User/Accounts.js b/dev/Settings/User/Accounts.js index d7856ee61..3b79644cd 100644 --- a/dev/Settings/User/Accounts.js +++ b/dev/Settings/User/Accounts.js @@ -15,7 +15,7 @@ IdentityStore = require('Stores/User/Identity'), Settings = require('Storage/Settings'), - Remote = require('Storage/User/Remote') + Remote = require('Remote/User/Ajax') ; /** diff --git a/dev/Settings/User/ChangePassword.js b/dev/Settings/User/ChangePassword.js index 7d011015d..8a53619c4 100644 --- a/dev/Settings/User/ChangePassword.js +++ b/dev/Settings/User/ChangePassword.js @@ -11,7 +11,7 @@ Utils = require('Common/Utils'), Translator = require('Common/Translator'), - Remote = require('Storage/User/Remote') + Remote = require('Remote/User/Ajax') ; /** diff --git a/dev/Settings/User/Contacts.js b/dev/Settings/User/Contacts.js index 35b6d51e4..a20d76156 100644 --- a/dev/Settings/User/Contacts.js +++ b/dev/Settings/User/Contacts.js @@ -9,7 +9,7 @@ AppStore = require('Stores/User/App'), ContactStore = require('Stores/User/Contact'), - Remote = require('Storage/User/Remote') + Remote = require('Remote/User/Ajax') ; /** diff --git a/dev/Settings/User/Filters.js b/dev/Settings/User/Filters.js index dc305c9f1..b3ed0292f 100644 --- a/dev/Settings/User/Filters.js +++ b/dev/Settings/User/Filters.js @@ -13,7 +13,7 @@ FilterStore = require('Stores/User/Filter'), - Remote = require('Storage/User/Remote') + Remote = require('Remote/User/Ajax') ; /** diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js index bcebce92f..207c456c6 100644 --- a/dev/Settings/User/Folders.js +++ b/dev/Settings/User/Folders.js @@ -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') ; /** diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js index 345b5acce..186066d1b 100644 --- a/dev/Settings/User/General.js +++ b/dev/Settings/User/General.js @@ -19,7 +19,7 @@ NotificationStore = require('Stores/User/Notification'), MessageStore = require('Stores/User/Message'), - Remote = require('Storage/User/Remote') + Remote = require('Remote/User/Ajax') ; /** diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js index e5da546da..7e87765a3 100644 --- a/dev/Settings/User/Security.js +++ b/dev/Settings/User/Security.js @@ -15,7 +15,7 @@ Settings = require('Storage/Settings'), - Remote = require('Storage/User/Remote') + Remote = require('Remote/User/Ajax') ; /** diff --git a/dev/Settings/User/Templates.js b/dev/Settings/User/Templates.js index c0b1e8e9a..db6991f7c 100644 --- a/dev/Settings/User/Templates.js +++ b/dev/Settings/User/Templates.js @@ -10,7 +10,7 @@ TemplateStore = require('Stores/User/Template'), - Remote = require('Storage/User/Remote') + Remote = require('Remote/User/Ajax') ; /** diff --git a/dev/Settings/User/Themes.js b/dev/Settings/User/Themes.js index 4c305f707..cbdeee8c6 100644 --- a/dev/Settings/User/Themes.js +++ b/dev/Settings/User/Themes.js @@ -18,7 +18,8 @@ ThemeStore = require('Stores/Theme'), Settings = require('Storage/Settings'), - Remote = require('Storage/User/Remote') + + Remote = require('Remote/User/Ajax') ; /** diff --git a/dev/Storage/User/Data.js b/dev/Storage/User/Data.js deleted file mode 100644 index 61f21970a..000000000 --- a/dev/Storage/User/Data.js +++ /dev/null @@ -1,16 +0,0 @@ - -(function () { - - 'use strict'; - - /** - * @constructor - */ - function DataUserStorage() - { - - } - - module.exports = new DataUserStorage(); - -}()); diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js index d033dbaad..35e9deedc 100644 --- a/dev/Stores/User/Folder.js +++ b/dev/Stores/User/Folder.js @@ -13,7 +13,7 @@ Globals = require('Common/Globals'), Utils = require('Common/Utils'), - Cache = require('Storage/User/Cache') + Cache = require('Common/Cache') ; /** diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js index b75326f3d..bca89535f 100644 --- a/dev/Stores/User/Message.js +++ b/dev/Stores/User/Message.js @@ -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') ; /** diff --git a/dev/Stores/User/Template.js b/dev/Stores/User/Template.js index 0e123a0ea..315fe1e1e 100644 --- a/dev/Stores/User/Template.js +++ b/dev/Stores/User/Template.js @@ -7,7 +7,7 @@ _ = require('_'), ko = require('ko') -// Remote = require('Storage/User/Remote') +// Remote = require('Remote/User/Ajax') ; /** diff --git a/dev/View/Admin/Login.js b/dev/View/Admin/Login.js index 782a22373..1c6ca20f2 100644 --- a/dev/View/Admin/Login.js +++ b/dev/View/Admin/Login.js @@ -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') diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js index d40a156f0..b6884adb0 100644 --- a/dev/View/Admin/Settings/Pane.js +++ b/dev/View/Admin/Settings/Pane.js @@ -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') diff --git a/dev/View/Popup/Account.js b/dev/View/Popup/Account.js index 403e76d0a..c8ddaa296 100644 --- a/dev/View/Popup/Account.js +++ b/dev/View/Popup/Account.js @@ -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') diff --git a/dev/View/Popup/Activate.js b/dev/View/Popup/Activate.js index f164dcce8..5a072f5b2 100644 --- a/dev/View/Popup/Activate.js +++ b/dev/View/Popup/Activate.js @@ -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'), diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index e90c9aad2..5cb13da4d 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -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); diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js index 275292441..42844cfd3 100644 --- a/dev/View/Popup/Contacts.js +++ b/dev/View/Popup/Contacts.js @@ -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'), diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js index 88f661bd9..800343878 100644 --- a/dev/View/Popup/Domain.js +++ b/dev/View/Popup/Domain.js @@ -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') diff --git a/dev/View/Popup/FolderClear.js b/dev/View/Popup/FolderClear.js index 137cdfcdf..d3dea40de 100644 --- a/dev/View/Popup/FolderClear.js +++ b/dev/View/Popup/FolderClear.js @@ -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') diff --git a/dev/View/Popup/FolderCreate.js b/dev/View/Popup/FolderCreate.js index 32af85e15..74eccde79 100644 --- a/dev/View/Popup/FolderCreate.js +++ b/dev/View/Popup/FolderCreate.js @@ -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') diff --git a/dev/View/Popup/FolderSystem.js b/dev/View/Popup/FolderSystem.js index a8914faca..1f4742de8 100644 --- a/dev/View/Popup/FolderSystem.js +++ b/dev/View/Popup/FolderSystem.js @@ -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') diff --git a/dev/View/Popup/Identity.js b/dev/View/Popup/Identity.js index e4930fffc..dbfe4ff15 100644 --- a/dev/View/Popup/Identity.js +++ b/dev/View/Popup/Identity.js @@ -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') diff --git a/dev/View/Popup/Plugin.js b/dev/View/Popup/Plugin.js index 433d77aa0..1f0631a06 100644 --- a/dev/View/Popup/Plugin.js +++ b/dev/View/Popup/Plugin.js @@ -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') diff --git a/dev/View/Popup/Template.js b/dev/View/Popup/Template.js index 315b5bde9..4c4551e5a 100644 --- a/dev/View/Popup/Template.js +++ b/dev/View/Popup/Template.js @@ -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') diff --git a/dev/View/Popup/TwoFactorTest.js b/dev/View/Popup/TwoFactorTest.js index 1a6153fdc..465f2fe9a 100644 --- a/dev/View/Popup/TwoFactorTest.js +++ b/dev/View/Popup/TwoFactorTest.js @@ -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') diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index d549cd141..225c52bf5 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -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); diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index c484eec73..4c644bd51 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -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') ; diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 9ae318f0a..fff46919e 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -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') diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 9494f5ca4..921b14cf4 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -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') diff --git a/dev/View/User/Settings/Menu.js b/dev/View/User/Settings/Menu.js index aeac72aa7..e642fdeb2 100644 --- a/dev/View/User/Settings/Menu.js +++ b/dev/View/User/Settings/Menu.js @@ -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') diff --git a/dev/View/User/Settings/Pane.js b/dev/View/User/Settings/Pane.js index 845044cdc..dff7f0fe3 100644 --- a/dev/View/User/Settings/Pane.js +++ b/dev/View/User/Settings/Pane.js @@ -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; diff --git a/package.json b/package.json index f318da47c..57485768b 100644 --- a/package.json +++ b/package.json @@ -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",