mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-30 04:29:21 +03:00
Code refactoring
This commit is contained in:
RainLoop Team
parent
345e7c58af
commit
8cf8b94d39
103 changed files with 664 additions and 659 deletions
|
|
@ -1,28 +0,0 @@
|
|||
|
||||
(function () {
|
||||
|
||||
'use strict';
|
||||
|
||||
var
|
||||
_ = require('_'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractSystemDropDownViewModel = require('View/App/AbstractSystemDropDown')
|
||||
;
|
||||
|
||||
/**
|
||||
* @constructor
|
||||
* @extends AbstractSystemDropDownViewModel
|
||||
*/
|
||||
function SystemDropDownMailBoxAppView()
|
||||
{
|
||||
AbstractSystemDropDownViewModel.call(this);
|
||||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/App/MailBox/SystemDropDown', 'MailBoxSystemDropDownViewModel'], SystemDropDownMailBoxAppView);
|
||||
_.extend(SystemDropDownMailBoxAppView.prototype, AbstractSystemDropDownViewModel.prototype);
|
||||
|
||||
module.exports = SystemDropDownMailBoxAppView;
|
||||
|
||||
}());
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
|
||||
(function () {
|
||||
|
||||
'use strict';
|
||||
|
||||
var
|
||||
_ = require('_'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractSystemDropDownAppView = require('View/App/AbstractSystemDropDown')
|
||||
;
|
||||
|
||||
/**
|
||||
* @constructor
|
||||
* @extends AbstractSystemDropDownAppView
|
||||
*/
|
||||
function SystemDropDownSettingsAppView()
|
||||
{
|
||||
AbstractSystemDropDownAppView.call(this);
|
||||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/App/Settings/SystemDropDown', 'SettingsSystemDropDownViewModel'], SystemDropDownSettingsAppView);
|
||||
_.extend(SystemDropDownSettingsAppView.prototype, AbstractSystemDropDownAppView.prototype);
|
||||
|
||||
module.exports = SystemDropDownSettingsAppView;
|
||||
|
||||
}());
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
Enums = require('Common/Enums'),
|
||||
Utils = require('Common/Utils'),
|
||||
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
{
|
||||
if (oData.Result)
|
||||
{
|
||||
require('App/App').accountsAndIdentities();
|
||||
require('App/User').accountsAndIdentities();
|
||||
this.cancelCommand();
|
||||
}
|
||||
else if (oData.ErrorCode)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
Utils = require('Common/Utils'),
|
||||
|
||||
Data = require('Storage/App/Data'),
|
||||
Data = require('Storage/User/Data'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
|
||||
oOpenpgpKeyring.store();
|
||||
|
||||
require('App/App').reloadOpenPgpKeys();
|
||||
require('App/User').reloadOpenPgpKeys();
|
||||
Utils.delegateRun(this, 'cancelCommand');
|
||||
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
Utils = require('Common/Utils'),
|
||||
|
||||
Data = require('Storage/App/Data'),
|
||||
Data = require('Storage/User/Data'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
HtmlEditor = require('Common/HtmlEditor'),
|
||||
|
||||
Settings = require('Storage/Settings'),
|
||||
Data = require('Storage/App/Data'),
|
||||
Cache = require('Storage/App/Cache'),
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Cache = require('Storage/User/Cache'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
ComposeAttachmentModel = require('Model/ComposeAttachment'),
|
||||
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
|
||||
this.deleteCommand = Utils.createCommand(this, function () {
|
||||
|
||||
require('App/App').deleteMessagesFromFolderWithoutCheck(this.draftFolder(), [this.draftUid()]);
|
||||
require('App/User').deleteMessagesFromFolderWithoutCheck(this.draftFolder(), [this.draftUid()]);
|
||||
kn.hideScreenPopup(ComposePopupView);
|
||||
|
||||
}, function () {
|
||||
|
|
@ -270,7 +270,7 @@
|
|||
}
|
||||
|
||||
Cache.setMessageFlagsToCache(this.aDraftInfo[2], this.aDraftInfo[1], aFlagsCache);
|
||||
require('App/App').reloadFlagsCurrentMessageListAndMessageFromCache();
|
||||
require('App/User').reloadFlagsCurrentMessageListAndMessageFromCache();
|
||||
Cache.setFolderHash(this.aDraftInfo[2], '');
|
||||
}
|
||||
}
|
||||
|
|
@ -408,7 +408,7 @@
|
|||
|
||||
ComposePopupView.prototype.emailsSource = function (oData, fResponse)
|
||||
{
|
||||
require('App/App').getAutocomplete(oData.term, function (aData) {
|
||||
require('App/User').getAutocomplete(oData.term, function (aData) {
|
||||
fResponse(_.map(aData, function (oEmailItem) {
|
||||
return oEmailItem.toLine(false);
|
||||
}));
|
||||
|
|
@ -446,11 +446,11 @@
|
|||
Cache.setFolderHash(sDraftFolder, '');
|
||||
if (Data.currentFolderFullNameRaw() === sDraftFolder)
|
||||
{
|
||||
require('App/App').reloadMessageList(true);
|
||||
require('App/User').reloadMessageList(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
require('App/App').folderInformation(sDraftFolder);
|
||||
require('App/User').folderInformation(sDraftFolder);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
Utils = require('Common/Utils'),
|
||||
Enums = require('Common/Enums'),
|
||||
|
||||
Data = require('Storage/App/Data'),
|
||||
Data = require('Storage/User/Data'),
|
||||
|
||||
EmailModel = require('Model/Email'),
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
Selector = require('Common/Selector'),
|
||||
Links = require('Common/Links'),
|
||||
|
||||
Data = require('Storage/App/Data'),
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
EmailModel = require('Model/Email'),
|
||||
ContactModel = require('Model/Contact'),
|
||||
|
|
@ -333,7 +333,7 @@
|
|||
this.syncCommand = Utils.createCommand(this, function () {
|
||||
|
||||
var self = this;
|
||||
require('App/App').contactsSync(function (sResult, oData) {
|
||||
require('App/User').contactsSync(function (sResult, oData) {
|
||||
if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result)
|
||||
{
|
||||
window.alert(Utils.getNotification(
|
||||
|
|
@ -447,12 +447,12 @@
|
|||
|
||||
ContactsPopupView.prototype.exportVcf = function ()
|
||||
{
|
||||
require('App/App').download(Links.exportContactsVcf());
|
||||
require('App/User').download(Links.exportContactsVcf());
|
||||
};
|
||||
|
||||
ContactsPopupView.prototype.exportCsv = function ()
|
||||
{
|
||||
require('App/App').download(Links.exportContactsCsv());
|
||||
require('App/User').download(Links.exportContactsCsv());
|
||||
};
|
||||
|
||||
ContactsPopupView.prototype.initUploader = function ()
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
Consts = require('Common/Consts'),
|
||||
Utils = require('Common/Utils'),
|
||||
|
||||
Data = require('Storage/App/Data'),
|
||||
Data = require('Storage/User/Data'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
Enums = require('Common/Enums'),
|
||||
Utils = require('Common/Utils'),
|
||||
|
||||
Data = require('Storage/App/Data'),
|
||||
Cache = require('Storage/App/Cache'),
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Cache = require('Storage/User/Cache'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
self.clearingProcess(false);
|
||||
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
|
||||
{
|
||||
require('App/App').reloadMessageList(true);
|
||||
require('App/User').reloadMessageList(true);
|
||||
self.cancelCommand();
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
Consts = require('Common/Consts'),
|
||||
Utils = require('Common/Utils'),
|
||||
|
||||
Data = require('Storage/App/Data'),
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
Data.foldersCreating(false);
|
||||
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
|
||||
{
|
||||
require('App/App').folders();
|
||||
require('App/User').folders();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
Utils = require('Common/Utils'),
|
||||
|
||||
Settings = require('Storage/Settings'),
|
||||
Data = require('Storage/App/Data'),
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
Enums = require('Common/Enums'),
|
||||
Utils = require('Common/Utils'),
|
||||
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Data = require('Storage/App/Data'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
Data = require('Storage/User/Data'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
{
|
||||
if (oData.Result)
|
||||
{
|
||||
require('App/App').accountsAndIdentities();
|
||||
require('App/User').accountsAndIdentities();
|
||||
this.cancelCommand();
|
||||
}
|
||||
else if (oData.ErrorCode)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
Utils = require('Common/Utils'),
|
||||
|
||||
Data = require('Storage/App/Data'),
|
||||
Data = require('Storage/User/Data'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
oOpenpgpKeyring.publicKeys.importKey(mKeyPair.publicKeyArmored);
|
||||
oOpenpgpKeyring.store();
|
||||
|
||||
require('App/App').reloadOpenPgpKeys();
|
||||
require('App/User').reloadOpenPgpKeys();
|
||||
Utils.delegateRun(self, 'cancelCommand');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
Enums = require('Common/Enums'),
|
||||
Utils = require('Common/Utils'),
|
||||
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
* @constructor
|
||||
* @extends AbstractView
|
||||
*/
|
||||
function AboutAppView()
|
||||
function AboutUserView()
|
||||
{
|
||||
AbstractView.call(this, 'Center', 'About');
|
||||
|
||||
|
|
@ -26,9 +26,9 @@
|
|||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/App/About', 'AboutViewModel'], AboutAppView);
|
||||
_.extend(AboutAppView.prototype, AbstractView.prototype);
|
||||
kn.extendAsViewModel(['View/User/About', 'View/App/About', 'AboutViewModel'], AboutUserView);
|
||||
_.extend(AboutUserView.prototype, AbstractView.prototype);
|
||||
|
||||
module.exports = AboutAppView;
|
||||
module.exports = AboutUserView;
|
||||
|
||||
}());
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
Links = require('Common/Links'),
|
||||
|
||||
Settings = require('Storage/Settings'),
|
||||
Data = require('Storage/App/Data'),
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
;
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
* @constructor
|
||||
* @extends AbstractView
|
||||
*/
|
||||
function AbstractSystemDropDownAppView()
|
||||
function AbstractSystemDropDownUserView()
|
||||
{
|
||||
AbstractView.call(this, 'Right', 'SystemDropDown');
|
||||
|
||||
|
|
@ -42,9 +42,9 @@
|
|||
this.accountClick = _.bind(this.accountClick, this);
|
||||
}
|
||||
|
||||
_.extend(AbstractSystemDropDownAppView.prototype, AbstractView.prototype);
|
||||
_.extend(AbstractSystemDropDownUserView.prototype, AbstractView.prototype);
|
||||
|
||||
AbstractSystemDropDownAppView.prototype.accountClick = function (oAccount, oEvent)
|
||||
AbstractSystemDropDownUserView.prototype.accountClick = function (oAccount, oEvent)
|
||||
{
|
||||
if (oAccount && oEvent && !Utils.isUnd(oEvent.which) && 1 === oEvent.which)
|
||||
{
|
||||
|
|
@ -58,22 +58,22 @@
|
|||
return true;
|
||||
};
|
||||
|
||||
AbstractSystemDropDownAppView.prototype.emailTitle = function ()
|
||||
AbstractSystemDropDownUserView.prototype.emailTitle = function ()
|
||||
{
|
||||
return Data.accountEmail();
|
||||
};
|
||||
|
||||
AbstractSystemDropDownAppView.prototype.settingsClick = function ()
|
||||
AbstractSystemDropDownUserView.prototype.settingsClick = function ()
|
||||
{
|
||||
require('Knoin/Knoin').setHash(Links.settings());
|
||||
};
|
||||
|
||||
AbstractSystemDropDownAppView.prototype.settingsHelp = function ()
|
||||
AbstractSystemDropDownUserView.prototype.settingsHelp = function ()
|
||||
{
|
||||
require('Knoin/Knoin').showScreenPopup(require('View/Popup/KeyboardShortcutsHelp'));
|
||||
};
|
||||
|
||||
AbstractSystemDropDownAppView.prototype.addAccountClick = function ()
|
||||
AbstractSystemDropDownUserView.prototype.addAccountClick = function ()
|
||||
{
|
||||
if (this.capaAdditionalAccounts())
|
||||
{
|
||||
|
|
@ -81,15 +81,15 @@
|
|||
}
|
||||
};
|
||||
|
||||
AbstractSystemDropDownAppView.prototype.logoutClick = function ()
|
||||
AbstractSystemDropDownUserView.prototype.logoutClick = function ()
|
||||
{
|
||||
Remote.logout(function () {
|
||||
require('App/App').loginAndLogoutReload(true,
|
||||
require('App/User').loginAndLogoutReload(true,
|
||||
Settings.settingsGet('ParentEmail') && 0 < Settings.settingsGet('ParentEmail').length);
|
||||
});
|
||||
};
|
||||
|
||||
AbstractSystemDropDownAppView.prototype.onBuild = function ()
|
||||
AbstractSystemDropDownUserView.prototype.onBuild = function ()
|
||||
{
|
||||
var self = this;
|
||||
key('`', [Enums.KeyState.MessageList, Enums.KeyState.MessageView, Enums.KeyState.Settings], function () {
|
||||
|
|
@ -109,6 +109,6 @@
|
|||
});
|
||||
};
|
||||
|
||||
module.exports = AbstractSystemDropDownAppView;
|
||||
module.exports = AbstractSystemDropDownUserView;
|
||||
|
||||
}());
|
||||
|
|
@ -14,8 +14,8 @@
|
|||
Links = require('Common/Links'),
|
||||
|
||||
Settings = require('Storage/Settings'),
|
||||
Data = require('Storage/App/Data'),
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
* @constructor
|
||||
* @extends AbstractView
|
||||
*/
|
||||
function LoginAppView()
|
||||
function LoginUserView()
|
||||
{
|
||||
AbstractView.call(this, 'Center', 'Login');
|
||||
|
||||
|
|
@ -130,11 +130,11 @@
|
|||
}
|
||||
else if (oData.Admin)
|
||||
{
|
||||
require('App/App').redirectToAdminPanel();
|
||||
require('App/User').redirectToAdminPanel();
|
||||
}
|
||||
else
|
||||
{
|
||||
require('App/App').loginAndLogoutReload();
|
||||
require('App/User').loginAndLogoutReload();
|
||||
}
|
||||
}
|
||||
else if (oData.ErrorCode)
|
||||
|
|
@ -234,10 +234,10 @@
|
|||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/App/Login', 'LoginViewModel'], LoginAppView);
|
||||
_.extend(LoginAppView.prototype, AbstractView.prototype);
|
||||
kn.extendAsViewModel(['View/User/Login', 'View/App/Login', 'LoginViewModel'], LoginUserView);
|
||||
_.extend(LoginUserView.prototype, AbstractView.prototype);
|
||||
|
||||
LoginAppView.prototype.onShow = function ()
|
||||
LoginUserView.prototype.onShow = function ()
|
||||
{
|
||||
kn.routeOff();
|
||||
|
||||
|
|
@ -259,13 +259,13 @@
|
|||
}, this), 100);
|
||||
};
|
||||
|
||||
LoginAppView.prototype.onHide = function ()
|
||||
LoginUserView.prototype.onHide = function ()
|
||||
{
|
||||
this.submitFocus(false);
|
||||
this.emailFocus(false);
|
||||
};
|
||||
|
||||
LoginAppView.prototype.onBuild = function ()
|
||||
LoginUserView.prototype.onBuild = function ()
|
||||
{
|
||||
var
|
||||
self = this,
|
||||
|
|
@ -275,7 +275,7 @@
|
|||
if (0 === iErrorCode)
|
||||
{
|
||||
self.submitRequest(true);
|
||||
require('App/App').loginAndLogoutReload();
|
||||
require('App/User').loginAndLogoutReload();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -338,16 +338,16 @@
|
|||
Utils.triggerAutocompleteInputChange(true);
|
||||
};
|
||||
|
||||
LoginAppView.prototype.submitForm = function ()
|
||||
LoginUserView.prototype.submitForm = function ()
|
||||
{
|
||||
this.submitCommand();
|
||||
};
|
||||
|
||||
LoginAppView.prototype.selectLanguage = function ()
|
||||
LoginUserView.prototype.selectLanguage = function ()
|
||||
{
|
||||
kn.showScreenPopup(require('View/Popup/Languages'));
|
||||
};
|
||||
|
||||
module.exports = LoginAppView;
|
||||
module.exports = LoginUserView;
|
||||
|
||||
}());
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
Links = require('Common/Links'),
|
||||
|
||||
Settings = require('Storage/Settings'),
|
||||
Cache = require('Storage/App/Cache'),
|
||||
Data = require('Storage/App/Data'),
|
||||
Cache = require('Storage/User/Cache'),
|
||||
Data = require('Storage/User/Data'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
* @constructor
|
||||
* @extends AbstractView
|
||||
*/
|
||||
function FolderListMailBoxAppView()
|
||||
function FolderListMailBoxUserView()
|
||||
{
|
||||
AbstractView.call(this, 'Left', 'MailFolderList');
|
||||
|
||||
|
|
@ -48,10 +48,10 @@
|
|||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/App/MailBox/FolderList', 'MailBoxFolderListViewModel'], FolderListMailBoxAppView);
|
||||
_.extend(FolderListMailBoxAppView.prototype, AbstractView.prototype);
|
||||
kn.extendAsViewModel(['View/User/MailBox/FolderList', 'View/App/MailBox/FolderList', 'MailBoxFolderListViewModel'], FolderListMailBoxUserView);
|
||||
_.extend(FolderListMailBoxUserView.prototype, AbstractView.prototype);
|
||||
|
||||
FolderListMailBoxAppView.prototype.onBuild = function (oDom)
|
||||
FolderListMailBoxUserView.prototype.onBuild = function (oDom)
|
||||
{
|
||||
this.oContentVisible = $('.b-content', oDom);
|
||||
this.oContentScrollable = $('.content', this.oContentVisible);
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
if (oFolder && oEvent)
|
||||
{
|
||||
bCollapsed = oFolder.collapsed();
|
||||
require('App/App').setExpandedFolder(oFolder.fullNameHash, bCollapsed);
|
||||
require('App/User').setExpandedFolder(oFolder.fullNameHash, bCollapsed);
|
||||
|
||||
oFolder.collapsed(!bCollapsed);
|
||||
oEvent.preventDefault();
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
if (oFolder)
|
||||
{
|
||||
bCollapsed = oFolder.collapsed();
|
||||
require('App/App').setExpandedFolder(oFolder.fullNameHash, bCollapsed);
|
||||
require('App/User').setExpandedFolder(oFolder.fullNameHash, bCollapsed);
|
||||
oFolder.collapsed(!bCollapsed);
|
||||
}
|
||||
}
|
||||
|
|
@ -174,25 +174,25 @@
|
|||
});
|
||||
};
|
||||
|
||||
FolderListMailBoxAppView.prototype.messagesDropOver = function (oFolder)
|
||||
FolderListMailBoxUserView.prototype.messagesDropOver = function (oFolder)
|
||||
{
|
||||
window.clearTimeout(this.iDropOverTimer);
|
||||
if (oFolder && oFolder.collapsed())
|
||||
{
|
||||
this.iDropOverTimer = window.setTimeout(function () {
|
||||
oFolder.collapsed(false);
|
||||
require('App/App').setExpandedFolder(oFolder.fullNameHash, true);
|
||||
require('App/User').setExpandedFolder(oFolder.fullNameHash, true);
|
||||
Utils.windowResize();
|
||||
}, 500);
|
||||
}
|
||||
};
|
||||
|
||||
FolderListMailBoxAppView.prototype.messagesDropOut = function ()
|
||||
FolderListMailBoxUserView.prototype.messagesDropOut = function ()
|
||||
{
|
||||
window.clearTimeout(this.iDropOverTimer);
|
||||
};
|
||||
|
||||
FolderListMailBoxAppView.prototype.scrollToFocused = function ()
|
||||
FolderListMailBoxUserView.prototype.scrollToFocused = function ()
|
||||
{
|
||||
if (!this.oContentVisible || !this.oContentScrollable)
|
||||
{
|
||||
|
|
@ -229,7 +229,7 @@
|
|||
* @param {FolderModel} oToFolder
|
||||
* @param {{helper:jQuery}} oUi
|
||||
*/
|
||||
FolderListMailBoxAppView.prototype.messagesDrop = function (oToFolder, oUi)
|
||||
FolderListMailBoxUserView.prototype.messagesDrop = function (oToFolder, oUi)
|
||||
{
|
||||
if (oToFolder && oUi && oUi.helper)
|
||||
{
|
||||
|
|
@ -241,27 +241,27 @@
|
|||
|
||||
if (Utils.isNormal(sFromFolderFullNameRaw) && '' !== sFromFolderFullNameRaw && Utils.isArray(aUids))
|
||||
{
|
||||
require('App/App').moveMessagesToFolder(sFromFolderFullNameRaw, aUids, oToFolder.fullNameRaw, bCopy);
|
||||
require('App/User').moveMessagesToFolder(sFromFolderFullNameRaw, aUids, oToFolder.fullNameRaw, bCopy);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
FolderListMailBoxAppView.prototype.composeClick = function ()
|
||||
FolderListMailBoxUserView.prototype.composeClick = function ()
|
||||
{
|
||||
kn.showScreenPopup(require('View/Popup/Compose'));
|
||||
};
|
||||
|
||||
FolderListMailBoxAppView.prototype.createFolder = function ()
|
||||
FolderListMailBoxUserView.prototype.createFolder = function ()
|
||||
{
|
||||
kn.showScreenPopup(require('View/Popup/FolderCreate'));
|
||||
};
|
||||
|
||||
FolderListMailBoxAppView.prototype.configureFolders = function ()
|
||||
FolderListMailBoxUserView.prototype.configureFolders = function ()
|
||||
{
|
||||
kn.setHash(Links.settings('folders'));
|
||||
};
|
||||
|
||||
FolderListMailBoxAppView.prototype.contactsClick = function ()
|
||||
FolderListMailBoxUserView.prototype.contactsClick = function ()
|
||||
{
|
||||
if (this.allowContacts)
|
||||
{
|
||||
|
|
@ -269,6 +269,6 @@
|
|||
}
|
||||
};
|
||||
|
||||
module.exports = FolderListMailBoxAppView;
|
||||
module.exports = FolderListMailBoxUserView;
|
||||
|
||||
}());
|
||||
|
|
@ -20,9 +20,9 @@
|
|||
Selector = require('Common/Selector'),
|
||||
|
||||
Settings = require('Storage/Settings'),
|
||||
Cache = require('Storage/App/Cache'),
|
||||
Data = require('Storage/App/Data'),
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Cache = require('Storage/User/Cache'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
* @constructor
|
||||
* @extends AbstractView
|
||||
*/
|
||||
function MessageListMailBoxAppView()
|
||||
function MessageListMailBoxUserView()
|
||||
{
|
||||
AbstractView.call(this, 'Right', 'MailMessageList');
|
||||
|
||||
|
|
@ -177,31 +177,31 @@
|
|||
}, this.canBeMoved);
|
||||
|
||||
this.deleteWithoutMoveCommand = Utils.createCommand(this, function () {
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.Trash,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
|
||||
Data.currentFolderFullNameRaw(),
|
||||
Data.messageListCheckedOrSelectedUidsWithSubMails(), false);
|
||||
}, this.canBeMoved);
|
||||
|
||||
this.deleteCommand = Utils.createCommand(this, function () {
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.Trash,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
|
||||
Data.currentFolderFullNameRaw(),
|
||||
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
|
||||
}, this.canBeMoved);
|
||||
|
||||
this.archiveCommand = Utils.createCommand(this, function () {
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.Archive,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Archive,
|
||||
Data.currentFolderFullNameRaw(),
|
||||
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
|
||||
}, this.canBeMoved);
|
||||
|
||||
this.spamCommand = Utils.createCommand(this, function () {
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.Spam,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Spam,
|
||||
Data.currentFolderFullNameRaw(),
|
||||
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
|
||||
}, this.canBeMoved);
|
||||
|
||||
this.notSpamCommand = Utils.createCommand(this, function () {
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.NotSpam,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.NotSpam,
|
||||
Data.currentFolderFullNameRaw(),
|
||||
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
|
||||
}, this.canBeMoved);
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
this.reloadCommand = Utils.createCommand(this, function () {
|
||||
if (!Data.messageListCompleteLoadingThrottle())
|
||||
{
|
||||
require('App/App').reloadMessageList(false, true);
|
||||
require('App/User').reloadMessageList(false, true);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -265,15 +265,15 @@
|
|||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/App/MailBox/MessageList', 'MailBoxMessageListViewModel'], MessageListMailBoxAppView);
|
||||
_.extend(MessageListMailBoxAppView.prototype, AbstractView.prototype);
|
||||
kn.extendAsViewModel(['View/User/MailBox/MessageList', 'View/App/MailBox/MessageList', 'MailBoxMessageListViewModel'], MessageListMailBoxUserView);
|
||||
_.extend(MessageListMailBoxUserView.prototype, AbstractView.prototype);
|
||||
|
||||
/**
|
||||
* @type {string}
|
||||
*/
|
||||
MessageListMailBoxAppView.prototype.emptySubjectValue = '';
|
||||
MessageListMailBoxUserView.prototype.emptySubjectValue = '';
|
||||
|
||||
MessageListMailBoxAppView.prototype.searchEnterAction = function ()
|
||||
MessageListMailBoxUserView.prototype.searchEnterAction = function ()
|
||||
{
|
||||
this.mainMessageListSearch(this.sLastSearchValue);
|
||||
this.inputMessageListSearchFocus(false);
|
||||
|
|
@ -282,13 +282,13 @@
|
|||
/**
|
||||
* @returns {string}
|
||||
*/
|
||||
MessageListMailBoxAppView.prototype.printableMessageCountForDeletion = function ()
|
||||
MessageListMailBoxUserView.prototype.printableMessageCountForDeletion = function ()
|
||||
{
|
||||
var iCnt = this.messageListCheckedOrSelectedUidsWithSubMails().length;
|
||||
return 1 < iCnt ? ' (' + (100 > iCnt ? iCnt : '99+') + ')' : '';
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.cancelSearch = function ()
|
||||
MessageListMailBoxUserView.prototype.cancelSearch = function ()
|
||||
{
|
||||
this.mainMessageListSearch('');
|
||||
this.inputMessageListSearchFocus(false);
|
||||
|
|
@ -299,11 +299,11 @@
|
|||
* @param {boolean} bCopy
|
||||
* @return {boolean}
|
||||
*/
|
||||
MessageListMailBoxAppView.prototype.moveSelectedMessagesToFolder = function (sToFolderFullNameRaw, bCopy)
|
||||
MessageListMailBoxUserView.prototype.moveSelectedMessagesToFolder = function (sToFolderFullNameRaw, bCopy)
|
||||
{
|
||||
if (this.canBeMoved())
|
||||
{
|
||||
require('App/App').moveMessagesToFolder(
|
||||
require('App/User').moveMessagesToFolder(
|
||||
Data.currentFolderFullNameRaw(),
|
||||
Data.messageListCheckedOrSelectedUidsWithSubMails(), sToFolderFullNameRaw, bCopy);
|
||||
}
|
||||
|
|
@ -311,7 +311,7 @@
|
|||
return false;
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.dragAndDronHelper = function (oMessageListItem)
|
||||
MessageListMailBoxUserView.prototype.dragAndDronHelper = function (oMessageListItem)
|
||||
{
|
||||
if (oMessageListItem)
|
||||
{
|
||||
|
|
@ -342,7 +342,7 @@
|
|||
* @param {AjaxJsonDefaultResponse} oData
|
||||
* @param {boolean} bCached
|
||||
*/
|
||||
MessageListMailBoxAppView.prototype.onMessageResponse = function (sResult, oData, bCached)
|
||||
MessageListMailBoxUserView.prototype.onMessageResponse = function (sResult, oData, bCached)
|
||||
{
|
||||
Data.hideMessageBodies();
|
||||
Data.messageLoading(false);
|
||||
|
|
@ -365,7 +365,7 @@
|
|||
}
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.populateMessageBody = function (oMessage)
|
||||
MessageListMailBoxUserView.prototype.populateMessageBody = function (oMessage)
|
||||
{
|
||||
if (oMessage)
|
||||
{
|
||||
|
|
@ -385,7 +385,7 @@
|
|||
* @param {number} iSetAction
|
||||
* @param {Array=} aMessages = null
|
||||
*/
|
||||
MessageListMailBoxAppView.prototype.setAction = function (sFolderFullNameRaw, iSetAction, aMessages)
|
||||
MessageListMailBoxUserView.prototype.setAction = function (sFolderFullNameRaw, iSetAction, aMessages)
|
||||
{
|
||||
var
|
||||
aUids = [],
|
||||
|
|
@ -458,7 +458,7 @@
|
|||
break;
|
||||
}
|
||||
|
||||
require('App/App').reloadFlagsCurrentMessageListAndMessageFromCache();
|
||||
require('App/User').reloadFlagsCurrentMessageListAndMessageFromCache();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -466,7 +466,7 @@
|
|||
* @param {string} sFolderFullNameRaw
|
||||
* @param {number} iSetAction
|
||||
*/
|
||||
MessageListMailBoxAppView.prototype.setActionForAll = function (sFolderFullNameRaw, iSetAction)
|
||||
MessageListMailBoxUserView.prototype.setActionForAll = function (sFolderFullNameRaw, iSetAction)
|
||||
{
|
||||
var
|
||||
oFolder = null,
|
||||
|
|
@ -509,37 +509,37 @@
|
|||
break;
|
||||
}
|
||||
|
||||
require('App/App').reloadFlagsCurrentMessageListAndMessageFromCache();
|
||||
require('App/User').reloadFlagsCurrentMessageListAndMessageFromCache();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.listSetSeen = function ()
|
||||
MessageListMailBoxUserView.prototype.listSetSeen = function ()
|
||||
{
|
||||
this.setAction(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.SetSeen, Data.messageListCheckedOrSelected());
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.listSetAllSeen = function ()
|
||||
MessageListMailBoxUserView.prototype.listSetAllSeen = function ()
|
||||
{
|
||||
this.setActionForAll(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.SetSeen);
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.listUnsetSeen = function ()
|
||||
MessageListMailBoxUserView.prototype.listUnsetSeen = function ()
|
||||
{
|
||||
this.setAction(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.UnsetSeen, Data.messageListCheckedOrSelected());
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.listSetFlags = function ()
|
||||
MessageListMailBoxUserView.prototype.listSetFlags = function ()
|
||||
{
|
||||
this.setAction(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.SetFlag, Data.messageListCheckedOrSelected());
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.listUnsetFlags = function ()
|
||||
MessageListMailBoxUserView.prototype.listUnsetFlags = function ()
|
||||
{
|
||||
this.setAction(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.UnsetFlag, Data.messageListCheckedOrSelected());
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.flagMessages = function (oCurrentMessage)
|
||||
MessageListMailBoxUserView.prototype.flagMessages = function (oCurrentMessage)
|
||||
{
|
||||
var
|
||||
aChecked = this.messageListCheckedOrSelected(),
|
||||
|
|
@ -568,7 +568,7 @@
|
|||
}
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.flagMessagesFast = function (bFlag)
|
||||
MessageListMailBoxUserView.prototype.flagMessagesFast = function (bFlag)
|
||||
{
|
||||
var
|
||||
aChecked = this.messageListCheckedOrSelected(),
|
||||
|
|
@ -594,7 +594,7 @@
|
|||
}
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.seenMessagesFast = function (bSeen)
|
||||
MessageListMailBoxUserView.prototype.seenMessagesFast = function (bSeen)
|
||||
{
|
||||
var
|
||||
aChecked = this.messageListCheckedOrSelected(),
|
||||
|
|
@ -620,7 +620,7 @@
|
|||
}
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.onBuild = function (oDom)
|
||||
MessageListMailBoxUserView.prototype.onBuild = function (oDom)
|
||||
{
|
||||
var self = this;
|
||||
|
||||
|
|
@ -653,7 +653,7 @@
|
|||
oMessage.lastInCollapsedThreadLoading(true);
|
||||
oMessage.lastInCollapsedThread(!oMessage.lastInCollapsedThread());
|
||||
|
||||
require('App/App').reloadMessageList();
|
||||
require('App/User').reloadMessageList();
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
@ -700,7 +700,7 @@
|
|||
}
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.initShortcuts = function ()
|
||||
MessageListMailBoxUserView.prototype.initShortcuts = function ()
|
||||
{
|
||||
var self = this;
|
||||
|
||||
|
|
@ -822,7 +822,7 @@
|
|||
});
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.prefetchNextTick = function ()
|
||||
MessageListMailBoxUserView.prototype.prefetchNextTick = function ()
|
||||
{
|
||||
if (ifvisible && !this.bPrefetch && !ifvisible.now() && this.viewModelVisibility())
|
||||
{
|
||||
|
|
@ -857,17 +857,17 @@
|
|||
}
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.composeClick = function ()
|
||||
MessageListMailBoxUserView.prototype.composeClick = function ()
|
||||
{
|
||||
kn.showScreenPopup(require('View/Popup/Compose'));
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.advancedSearchClick = function ()
|
||||
MessageListMailBoxUserView.prototype.advancedSearchClick = function ()
|
||||
{
|
||||
kn.showScreenPopup(require('View/Popup/AdvancedSearch'));
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.quotaTooltip = function ()
|
||||
MessageListMailBoxUserView.prototype.quotaTooltip = function ()
|
||||
{
|
||||
return Utils.i18n('MESSAGE_LIST/QUOTA_SIZE', {
|
||||
'SIZE': Utils.friendlySize(this.userUsageSize()),
|
||||
|
|
@ -876,7 +876,7 @@
|
|||
});
|
||||
};
|
||||
|
||||
MessageListMailBoxAppView.prototype.initUploaderForAppend = function ()
|
||||
MessageListMailBoxUserView.prototype.initUploaderForAppend = function ()
|
||||
{
|
||||
if (!Settings.settingsGet('AllowAppendMessage') || !this.dragOverArea())
|
||||
{
|
||||
|
|
@ -923,13 +923,13 @@
|
|||
return false;
|
||||
}, this))
|
||||
.on('onComplete', _.bind(function () {
|
||||
require('App/App').reloadMessageList(true, true);
|
||||
require('App/User').reloadMessageList(true, true);
|
||||
}, this))
|
||||
;
|
||||
|
||||
return !!oJua;
|
||||
};
|
||||
|
||||
module.exports = MessageListMailBoxAppView;
|
||||
module.exports = MessageListMailBoxUserView;
|
||||
|
||||
}());
|
||||
|
|
@ -15,9 +15,9 @@
|
|||
Utils = require('Common/Utils'),
|
||||
Events = require('Common/Events'),
|
||||
|
||||
Cache = require('Storage/App/Cache'),
|
||||
Data = require('Storage/App/Data'),
|
||||
Remote = require('Storage/App/Remote'),
|
||||
Cache = require('Storage/User/Cache'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Remote = require('Storage/User/Remote'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
* @constructor
|
||||
* @extends AbstractView
|
||||
*/
|
||||
function MessageViewMailBoxAppView()
|
||||
function MessageViewMailBoxUserView()
|
||||
{
|
||||
AbstractView.call(this, 'Right', 'MailMessageView');
|
||||
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
this.deleteCommand = Utils.createCommand(this, function () {
|
||||
if (this.message())
|
||||
{
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.Trash,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
|
||||
this.message().folderFullNameRaw,
|
||||
[this.message().uid], true);
|
||||
}
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
this.deleteWithoutMoveCommand = Utils.createCommand(this, function () {
|
||||
if (this.message())
|
||||
{
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.Trash,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
|
||||
Data.currentFolderFullNameRaw(),
|
||||
[this.message().uid], false);
|
||||
}
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
this.archiveCommand = Utils.createCommand(this, function () {
|
||||
if (this.message())
|
||||
{
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.Archive,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Archive,
|
||||
this.message().folderFullNameRaw,
|
||||
[this.message().uid], true);
|
||||
}
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
this.spamCommand = Utils.createCommand(this, function () {
|
||||
if (this.message())
|
||||
{
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.Spam,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Spam,
|
||||
this.message().folderFullNameRaw,
|
||||
[this.message().uid], true);
|
||||
}
|
||||
|
|
@ -134,7 +134,7 @@
|
|||
this.notSpamCommand = Utils.createCommand(this, function () {
|
||||
if (this.message())
|
||||
{
|
||||
require('App/App').deleteMessagesFromFolder(Enums.FolderType.NotSpam,
|
||||
require('App/User').deleteMessagesFromFolder(Enums.FolderType.NotSpam,
|
||||
this.message().folderFullNameRaw,
|
||||
[this.message().uid], true);
|
||||
}
|
||||
|
|
@ -248,25 +248,25 @@
|
|||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/App/MailBox/MessageView', 'MailBoxMessageViewViewModel'], MessageViewMailBoxAppView);
|
||||
_.extend(MessageViewMailBoxAppView.prototype, AbstractView.prototype);
|
||||
kn.extendAsViewModel(['View/User/MailBox/MessageView', 'View/App/MailBox/MessageView', 'MailBoxMessageViewViewModel'], MessageViewMailBoxUserView);
|
||||
_.extend(MessageViewMailBoxUserView.prototype, AbstractView.prototype);
|
||||
|
||||
MessageViewMailBoxAppView.prototype.isPgpActionVisible = function ()
|
||||
MessageViewMailBoxUserView.prototype.isPgpActionVisible = function ()
|
||||
{
|
||||
return Enums.SignedVerifyStatus.Success !== this.viewPgpSignedVerifyStatus();
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.isPgpStatusVerifyVisible = function ()
|
||||
MessageViewMailBoxUserView.prototype.isPgpStatusVerifyVisible = function ()
|
||||
{
|
||||
return Enums.SignedVerifyStatus.None !== this.viewPgpSignedVerifyStatus();
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.isPgpStatusVerifySuccess = function ()
|
||||
MessageViewMailBoxUserView.prototype.isPgpStatusVerifySuccess = function ()
|
||||
{
|
||||
return Enums.SignedVerifyStatus.Success === this.viewPgpSignedVerifyStatus();
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.pgpStatusVerifyMessage = function ()
|
||||
MessageViewMailBoxUserView.prototype.pgpStatusVerifyMessage = function ()
|
||||
{
|
||||
var sResult = '';
|
||||
switch (this.viewPgpSignedVerifyStatus())
|
||||
|
|
@ -293,19 +293,19 @@
|
|||
return sResult;
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.fullScreen = function ()
|
||||
MessageViewMailBoxUserView.prototype.fullScreen = function ()
|
||||
{
|
||||
this.fullScreenMode(true);
|
||||
Utils.windowResize();
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.unFullScreen = function ()
|
||||
MessageViewMailBoxUserView.prototype.unFullScreen = function ()
|
||||
{
|
||||
this.fullScreenMode(false);
|
||||
Utils.windowResize();
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.toggleFullScreen = function ()
|
||||
MessageViewMailBoxUserView.prototype.toggleFullScreen = function ()
|
||||
{
|
||||
Utils.removeSelection();
|
||||
|
||||
|
|
@ -316,12 +316,12 @@
|
|||
/**
|
||||
* @param {string} sType
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.replyOrforward = function (sType)
|
||||
MessageViewMailBoxUserView.prototype.replyOrforward = function (sType)
|
||||
{
|
||||
kn.showScreenPopup(require('View/Popup/Compose'), [sType, Data.message()]);
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.onBuild = function (oDom)
|
||||
MessageViewMailBoxUserView.prototype.onBuild = function (oDom)
|
||||
{
|
||||
var self = this;
|
||||
this.fullScreenMode.subscribe(function (bValue) {
|
||||
|
|
@ -370,7 +370,7 @@
|
|||
|
||||
if (oAttachment && oAttachment.download)
|
||||
{
|
||||
require('App/App').download(oAttachment.linkDownload());
|
||||
require('App/User').download(oAttachment.linkDownload());
|
||||
}
|
||||
})
|
||||
;
|
||||
|
|
@ -408,7 +408,7 @@
|
|||
/**
|
||||
* @return {boolean}
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.escShortcuts = function ()
|
||||
MessageViewMailBoxUserView.prototype.escShortcuts = function ()
|
||||
{
|
||||
if (this.viewModelVisibility() && this.message())
|
||||
{
|
||||
|
|
@ -429,7 +429,7 @@
|
|||
}
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.initShortcuts = function ()
|
||||
MessageViewMailBoxUserView.prototype.initShortcuts = function ()
|
||||
{
|
||||
var
|
||||
self = this
|
||||
|
|
@ -570,7 +570,7 @@
|
|||
/**
|
||||
* @return {boolean}
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.isDraftFolder = function ()
|
||||
MessageViewMailBoxUserView.prototype.isDraftFolder = function ()
|
||||
{
|
||||
return Data.message() && Data.draftFolder() === Data.message().folderFullNameRaw;
|
||||
};
|
||||
|
|
@ -578,7 +578,7 @@
|
|||
/**
|
||||
* @return {boolean}
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.isSentFolder = function ()
|
||||
MessageViewMailBoxUserView.prototype.isSentFolder = function ()
|
||||
{
|
||||
return Data.message() && Data.sentFolder() === Data.message().folderFullNameRaw;
|
||||
};
|
||||
|
|
@ -586,7 +586,7 @@
|
|||
/**
|
||||
* @return {boolean}
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.isSpamFolder = function ()
|
||||
MessageViewMailBoxUserView.prototype.isSpamFolder = function ()
|
||||
{
|
||||
return Data.message() && Data.spamFolder() === Data.message().folderFullNameRaw;
|
||||
};
|
||||
|
|
@ -594,7 +594,7 @@
|
|||
/**
|
||||
* @return {boolean}
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.isSpamDisabled = function ()
|
||||
MessageViewMailBoxUserView.prototype.isSpamDisabled = function ()
|
||||
{
|
||||
return Data.message() && Data.spamFolder() === Consts.Values.UnuseOptionValue;
|
||||
};
|
||||
|
|
@ -602,7 +602,7 @@
|
|||
/**
|
||||
* @return {boolean}
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.isArchiveFolder = function ()
|
||||
MessageViewMailBoxUserView.prototype.isArchiveFolder = function ()
|
||||
{
|
||||
return Data.message() && Data.archiveFolder() === Data.message().folderFullNameRaw;
|
||||
};
|
||||
|
|
@ -610,7 +610,7 @@
|
|||
/**
|
||||
* @return {boolean}
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.isArchiveDisabled = function ()
|
||||
MessageViewMailBoxUserView.prototype.isArchiveDisabled = function ()
|
||||
{
|
||||
return Data.message() && Data.archiveFolder() === Consts.Values.UnuseOptionValue;
|
||||
};
|
||||
|
|
@ -618,17 +618,17 @@
|
|||
/**
|
||||
* @return {boolean}
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.isDraftOrSentFolder = function ()
|
||||
MessageViewMailBoxUserView.prototype.isDraftOrSentFolder = function ()
|
||||
{
|
||||
return this.isDraftFolder() || this.isSentFolder();
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.composeClick = function ()
|
||||
MessageViewMailBoxUserView.prototype.composeClick = function ()
|
||||
{
|
||||
kn.showScreenPopup(require('View/Popup/Compose'));
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.editMessage = function ()
|
||||
MessageViewMailBoxUserView.prototype.editMessage = function ()
|
||||
{
|
||||
if (Data.message())
|
||||
{
|
||||
|
|
@ -636,7 +636,7 @@
|
|||
}
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.scrollMessageToTop = function ()
|
||||
MessageViewMailBoxUserView.prototype.scrollMessageToTop = function ()
|
||||
{
|
||||
if (this.oMessageScrollerDom)
|
||||
{
|
||||
|
|
@ -645,7 +645,7 @@
|
|||
}
|
||||
};
|
||||
|
||||
MessageViewMailBoxAppView.prototype.scrollMessageToLeft = function ()
|
||||
MessageViewMailBoxUserView.prototype.scrollMessageToLeft = function ()
|
||||
{
|
||||
if (this.oMessageScrollerDom)
|
||||
{
|
||||
|
|
@ -657,7 +657,7 @@
|
|||
/**
|
||||
* @param {MessageModel} oMessage
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.showImages = function (oMessage)
|
||||
MessageViewMailBoxUserView.prototype.showImages = function (oMessage)
|
||||
{
|
||||
if (oMessage && oMessage.showExternalImages)
|
||||
{
|
||||
|
|
@ -668,7 +668,7 @@
|
|||
/**
|
||||
* @returns {string}
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.printableCheckedMessageCount = function ()
|
||||
MessageViewMailBoxUserView.prototype.printableCheckedMessageCount = function ()
|
||||
{
|
||||
var iCnt = this.messageListCheckedOrSelectedUidsWithSubMails().length;
|
||||
return 0 < iCnt ? (100 > iCnt ? iCnt : '99+') : '';
|
||||
|
|
@ -678,7 +678,7 @@
|
|||
/**
|
||||
* @param {MessageModel} oMessage
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.verifyPgpSignedClearMessage = function (oMessage)
|
||||
MessageViewMailBoxUserView.prototype.verifyPgpSignedClearMessage = function (oMessage)
|
||||
{
|
||||
if (oMessage)
|
||||
{
|
||||
|
|
@ -689,7 +689,7 @@
|
|||
/**
|
||||
* @param {MessageModel} oMessage
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.decryptPgpEncryptedMessage = function (oMessage)
|
||||
MessageViewMailBoxUserView.prototype.decryptPgpEncryptedMessage = function (oMessage)
|
||||
{
|
||||
if (oMessage)
|
||||
{
|
||||
|
|
@ -700,7 +700,7 @@
|
|||
/**
|
||||
* @param {MessageModel} oMessage
|
||||
*/
|
||||
MessageViewMailBoxAppView.prototype.readReceipt = function (oMessage)
|
||||
MessageViewMailBoxUserView.prototype.readReceipt = function (oMessage)
|
||||
{
|
||||
if (oMessage && '' !== oMessage.readReceipt())
|
||||
{
|
||||
|
|
@ -713,10 +713,10 @@
|
|||
|
||||
Cache.storeMessageFlagsToCache(oMessage);
|
||||
|
||||
require('App/App').reloadFlagsCurrentMessageListAndMessageFromCache();
|
||||
require('App/User').reloadFlagsCurrentMessageListAndMessageFromCache();
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = MessageViewMailBoxAppView;
|
||||
module.exports = MessageViewMailBoxUserView;
|
||||
|
||||
}());
|
||||
28
dev/View/User/MailBox/SystemDropDown.js
Normal file
28
dev/View/User/MailBox/SystemDropDown.js
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
|
||||
(function () {
|
||||
|
||||
'use strict';
|
||||
|
||||
var
|
||||
_ = require('_'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractSystemDropDownViewModel = require('View/User/AbstractSystemDropDown')
|
||||
;
|
||||
|
||||
/**
|
||||
* @constructor
|
||||
* @extends AbstractSystemDropDownViewModel
|
||||
*/
|
||||
function SystemDropDownMailBoxUserView()
|
||||
{
|
||||
AbstractSystemDropDownViewModel.call(this);
|
||||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/User/MailBox/SystemDropDown', 'View/App/MailBox/SystemDropDown', 'MailBoxSystemDropDownViewModel'], SystemDropDownMailBoxUserView);
|
||||
_.extend(SystemDropDownMailBoxUserView.prototype, AbstractSystemDropDownViewModel.prototype);
|
||||
|
||||
module.exports = SystemDropDownMailBoxUserView;
|
||||
|
||||
}());
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
Globals = require('Common/Globals'),
|
||||
Links = require('Common/Links'),
|
||||
|
||||
Cache = require('Storage/App/Cache'),
|
||||
Cache = require('Storage/User/Cache'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
* @constructor
|
||||
* @extends AbstractView
|
||||
*/
|
||||
function MenuSettingsAppView(oScreen)
|
||||
function MenuSettingsUserView(oScreen)
|
||||
{
|
||||
AbstractView.call(this, 'Left', 'SettingsMenu');
|
||||
|
||||
|
|
@ -32,19 +32,19 @@
|
|||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/App/Settings/Menu', 'SettingsMenuViewModel'], MenuSettingsAppView);
|
||||
_.extend(MenuSettingsAppView.prototype, AbstractView.prototype);
|
||||
kn.extendAsViewModel(['View/User/Settings/Menu', 'View/App/Settings/Menu', 'SettingsMenuViewModel'], MenuSettingsUserView);
|
||||
_.extend(MenuSettingsUserView.prototype, AbstractView.prototype);
|
||||
|
||||
MenuSettingsAppView.prototype.link = function (sRoute)
|
||||
MenuSettingsUserView.prototype.link = function (sRoute)
|
||||
{
|
||||
return Links.settings(sRoute);
|
||||
};
|
||||
|
||||
MenuSettingsAppView.prototype.backToMailBoxClick = function ()
|
||||
MenuSettingsUserView.prototype.backToMailBoxClick = function ()
|
||||
{
|
||||
kn.setHash(Links.inbox(Cache.getFolderInboxName()));
|
||||
};
|
||||
|
||||
module.exports = MenuSettingsAppView;
|
||||
module.exports = MenuSettingsUserView;
|
||||
|
||||
}());
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
Enums = require('Common/Enums'),
|
||||
Links = require('Common/Links'),
|
||||
|
||||
Data = require('Storage/App/Data'),
|
||||
Cache = require('Storage/App/Cache'),
|
||||
Data = require('Storage/User/Data'),
|
||||
Cache = require('Storage/User/Cache'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractView = require('Knoin/AbstractView')
|
||||
|
|
@ -21,17 +21,17 @@
|
|||
* @constructor
|
||||
* @extends AbstractView
|
||||
*/
|
||||
function PaneSettingsAppView()
|
||||
function PaneSettingsUserView()
|
||||
{
|
||||
AbstractView.call(this, 'Right', 'SettingsPane');
|
||||
|
||||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/App/Settings/Pane', 'SettingsPaneViewModel'], PaneSettingsAppView);
|
||||
_.extend(PaneSettingsAppView.prototype, AbstractView.prototype);
|
||||
kn.extendAsViewModel(['View/User/Settings/Pane', 'View/App/Settings/Pane', 'SettingsPaneViewModel'], PaneSettingsUserView);
|
||||
_.extend(PaneSettingsUserView.prototype, AbstractView.prototype);
|
||||
|
||||
PaneSettingsAppView.prototype.onBuild = function ()
|
||||
PaneSettingsUserView.prototype.onBuild = function ()
|
||||
{
|
||||
var self = this;
|
||||
key('esc', Enums.KeyState.Settings, function () {
|
||||
|
|
@ -39,16 +39,16 @@
|
|||
});
|
||||
};
|
||||
|
||||
PaneSettingsAppView.prototype.onShow = function ()
|
||||
PaneSettingsUserView.prototype.onShow = function ()
|
||||
{
|
||||
Data.message(null);
|
||||
};
|
||||
|
||||
PaneSettingsAppView.prototype.backToMailBoxClick = function ()
|
||||
PaneSettingsUserView.prototype.backToMailBoxClick = function ()
|
||||
{
|
||||
kn.setHash(Links.inbox(Cache.getFolderInboxName()));
|
||||
};
|
||||
|
||||
module.exports = PaneSettingsAppView;
|
||||
module.exports = PaneSettingsUserView;
|
||||
|
||||
}());
|
||||
28
dev/View/User/Settings/SystemDropDown.js
Normal file
28
dev/View/User/Settings/SystemDropDown.js
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
|
||||
(function () {
|
||||
|
||||
'use strict';
|
||||
|
||||
var
|
||||
_ = require('_'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
AbstractSystemDropDownUserView = require('View/User/AbstractSystemDropDown')
|
||||
;
|
||||
|
||||
/**
|
||||
* @constructor
|
||||
* @extends AbstractSystemDropDownUserView
|
||||
*/
|
||||
function SystemDropDownSettingsUserView()
|
||||
{
|
||||
AbstractSystemDropDownUserView.call(this);
|
||||
kn.constructorEnd(this);
|
||||
}
|
||||
|
||||
kn.extendAsViewModel(['View/User/Settings/SystemDropDown', 'View/App/Settings/SystemDropDown', 'SettingsSystemDropDownViewModel'], SystemDropDownSettingsUserView);
|
||||
_.extend(SystemDropDownSettingsUserView.prototype, AbstractSystemDropDownUserView.prototype);
|
||||
|
||||
module.exports = SystemDropDownSettingsUserView;
|
||||
|
||||
}());
|
||||
Loading…
Add table
Add a link
Reference in a new issue