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

Code refactoring

Browse source
This commit is contained in:
RainLoop Team 2014-08-27 19:59:44 +04:00
parent 36329110e5
commit b4f416b6f8
105 changed files with 4331 additions and 4339 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dev/ViewModels/Popups/PopupsActivateViewModel.js
View file

@ -10,12 +10,12 @@
Enums = require('Enums'),
Utils = require('Utils'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js'),
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data'),
Remote = require('Storage:Admin:Remote'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -108,7 +108,7 @@
PopupsActivateViewModel.prototype.onShow = function ()
{
this.domain(AppSettings.settingsGet('AdminDomain'));
this.domain(Settings.settingsGet('AdminDomain'));
if (!this.activateProcess())
{
this.key('');

10
dev/ViewModels/Popups/PopupsAddAccountViewModel.js
View file

@ -11,10 +11,10 @@
Enums = require('Enums'),
Utils = require('Utils'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
Remote = require('Storage:RainLoop:Remote'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -25,8 +25,6 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsAddAccount');
var App = require('../../Apps/RainLoopApp.js');
this.email = ko.observable('');
this.password = ko.observable('');
@ -65,7 +63,7 @@
{
if (oData.Result)
{
App.accountsAndIdentities();
require('App:RainLoop').accountsAndIdentities();
this.cancelCommand();
}
else if (oData.ErrorCode)

10
dev/ViewModels/Popups/PopupsAddOpenPgpKeyViewModel.js
View file

@ -9,10 +9,10 @@
Utils = require('Utils'),
Data = require('../../Storages/WebMailDataStorage.js'),
Data = require('Storage:RainLoop:Data'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -23,8 +23,6 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsAddOpenPgpKey');
var App = require('../../Apps/RainLoopApp.js');
this.key = ko.observable('');
this.key.error = ko.observable(false);
this.key.focus = ko.observable(false);
@ -79,7 +77,7 @@
oOpenpgpKeyring.store();
App.reloadOpenPgpKeys();
require('App:RainLoop').reloadOpenPgpKeys();
Utils.delegateRun(this, 'cancelCommand');
return true;

6
dev/ViewModels/Popups/PopupsAdvancedSearchViewModel.js
View file

@ -10,10 +10,10 @@
Utils = require('Utils'),
Data = require('../../Storages/WebMailDataStorage.js'),
Data = require('Storage:RainLoop:Data'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**

4
dev/ViewModels/Popups/PopupsAskViewModel.js
View file

@ -11,8 +11,8 @@
Enums = require('Enums'),
Utils = require('Utils'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**

8
dev/ViewModels/Popups/PopupsComposeOpenPgpViewModel.js
View file

@ -13,12 +13,12 @@
Utils = require('Utils'),
Enums = require('Enums'),
Data = require('../../Storages/WebMailDataStorage.js'),
Data = require('Storage:RainLoop:Data'),
EmailModel = require('../../Models/EmailModel.js'),
EmailModel = require('Model:Email'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**

72
dev/ViewModels/Popups/PopupsComposeViewModel.js
View file

@ -10,7 +10,7 @@
_ = require('_'),
ko = require('ko'),
moment = require('moment'),
$window = require('$window'),
$win = require('$win'),
JSON = require('JSON'),
Jua = require('Jua'),
@ -20,21 +20,17 @@
Globals = require('Globals'),
LinkBuilder = require('LinkBuilder'),
Events = require('Events'),
NewHtmlEditorWrapper = require('NewHtmlEditorWrapper'),
HtmlEditor = require('HtmlEditor'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/WebMailDataStorage.js'),
Cache = require('../../Storages/WebMailCacheStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
Settings = require('Storage:Settings'),
Data = require('Storage:RainLoop:Data'),
Cache = require('Storage:RainLoop:Cache'),
Remote = require('Storage:RainLoop:Remote'),
ComposeAttachmentModel = require('../../Models/ComposeAttachmentModel.js'),
ComposeAttachmentModel = require('Model:ComposeAttachment'),
PopupsComposeOpenPgpViewModel = require('./PopupsComposeOpenPgpViewModel.js'),
PopupsFolderSystemViewModel = require('./PopupsFolderSystemViewModel.js'),
PopupsAskViewModel = require('./PopupsAskViewModel.js'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -45,8 +41,6 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsCompose');
var App = require('../../Apps/RainLoopApp.js');
this.oEditor = null;
this.aDraftInfo = null;
this.sInReplyTo = '';
@ -54,7 +48,7 @@
this.bSkipNext = false;
this.sReferences = '';
this.bCapaAdditionalIdentities = AppSettings.capa(Enums.Capa.AdditionalIdentities);
this.bCapaAdditionalIdentities = Settings.capa(Enums.Capa.AdditionalIdentities);
var
self = this,
@ -219,7 +213,7 @@
this.deleteCommand = Utils.createCommand(this, function () {
App.deleteMessagesFromFolderWithoutCheck(this.draftFolder(), [this.draftUid()]);
require('App:RainLoop').deleteMessagesFromFolderWithoutCheck(this.draftFolder(), [this.draftUid()]);
kn.hideScreenPopup(PopupsComposeViewModel);
}, function () {
@ -256,7 +250,7 @@
if ('' === sSentFolder)
{
kn.showScreenPopup(PopupsFolderSystemViewModel, [Enums.SetSystemFoldersNotification.Sent]);
kn.showScreenPopup(require('View:Popup:FolderSystem'), [Enums.SetSystemFoldersNotification.Sent]);
}
else
{
@ -278,7 +272,7 @@
}
Cache.setMessageFlagsToCache(this.aDraftInfo[2], this.aDraftInfo[1], aFlagsCache);
App.reloadFlagsCurrentMessageListAndMessageFromCache();
require('App:RainLoop').reloadFlagsCurrentMessageListAndMessageFromCache();
Cache.setFolderHash(this.aDraftInfo[2], '');
}
}
@ -314,7 +308,7 @@
if (Data.draftFolderNotEnabled())
{
kn.showScreenPopup(PopupsFolderSystemViewModel, [Enums.SetSystemFoldersNotification.Draft]);
kn.showScreenPopup(require('View:Popup:FolderSystem'), [Enums.SetSystemFoldersNotification.Draft]);
}
else
{
@ -359,7 +353,7 @@
this.triggerForResize();
}, this);
this.dropboxEnabled = ko.observable(!!AppSettings.settingsGet('DropboxApiKey'));
this.dropboxEnabled = ko.observable(!!Settings.settingsGet('DropboxApiKey'));
this.dropboxCommand = Utils.createCommand(this, function () {
@ -386,7 +380,7 @@
});
this.driveEnabled = ko.observable(Globals.bXMLHttpRequestSupported &&
!!AppSettings.settingsGet('GoogleClientID') && !!AppSettings.settingsGet('GoogleApiKey'));
!!Settings.settingsGet('GoogleClientID') && !!Settings.settingsGet('GoogleApiKey'));
this.driveVisible = ko.observable(false);
@ -415,8 +409,7 @@
PopupsComposeViewModel.prototype.emailsSource = function (oData, fResponse)
{
var App = require('../../Apps/RainLoopApp.js');
App.getAutocomplete(oData.term, function (aData) {
require('App:RainLoop').getAutocomplete(oData.term, function (aData) {
fResponse(_.map(aData, function (oEmailItem) {
return oEmailItem.toLine(false);
}));
@ -428,7 +421,7 @@
if (this.capaOpenPGP() && this.oEditor && !this.oEditor.isHtml())
{
var self = this;
kn.showScreenPopup(PopupsComposeOpenPgpViewModel, [
kn.showScreenPopup(require('View:Popup:ComposeOpenPgp'), [
function (sResult) {
self.editor(function (oEditor) {
oEditor.setPlain(sResult);
@ -446,7 +439,6 @@
PopupsComposeViewModel.prototype.reloadDraftFolder = function ()
{
var
App = require('../../Apps/RainLoopApp.js'),
sDraftFolder = Data.draftFolder()
;
@ -455,11 +447,11 @@
Cache.setFolderHash(sDraftFolder, '');
if (Data.currentFolderFullNameRaw() === sDraftFolder)
{
App.reloadMessageList(true);
require('App:RainLoop').reloadMessageList(true);
}
else
{
App.folderInformation(sDraftFolder);
require('App:RainLoop').folderInformation(sDraftFolder);
}
}
};
@ -715,7 +707,7 @@
if (!this.oEditor && this.composeEditorArea())
{
_.delay(function () {
self.oEditor = new NewHtmlEditorWrapper(self.composeEditorArea(), null, function () {
self.oEditor = new HtmlEditor(self.composeEditorArea(), null, function () {
fOnInit(self.oEditor);
}, function (bHtml) {
self.isHtml(!!bHtml);
@ -1016,7 +1008,11 @@
PopupsComposeViewModel.prototype.tryToClosePopup = function ()
{
var self = this;
var
self = this,
PopupsAskViewModel = require('View:Popup:Ask')
;
if (!kn.isPopupVisible(PopupsAskViewModel))
{
kn.showScreenPopup(PopupsAskViewModel, [Utils.i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'), function () {
@ -1060,7 +1056,7 @@
return false;
});
$window.on('resize', function () {
$win.on('resize', function () {
self.triggerForResize();
});
@ -1069,7 +1065,7 @@
oScript = window.document.createElement('script');
oScript.type = 'text/javascript';
oScript.src = 'https://www.dropbox.com/static/api/1/dropins.js';
$(oScript).attr('id', 'dropboxjs').attr('data-app-key', AppSettings.settingsGet('DropboxApiKey'));
$(oScript).attr('id', 'dropboxjs').attr('data-app-key', Settings.settingsGet('DropboxApiKey'));
window.document.body.appendChild(oScript);
}
@ -1168,7 +1164,7 @@
new window.google.picker.DocsView()
.setIncludeFolders(true)
)
.setAppId(AppSettings.settingsGet('GoogleClientID'))
.setAppId(Settings.settingsGet('GoogleClientID'))
.setOAuthToken(oOauthToken.access_token)
.setCallback(_.bind(self.driveCallback, self, oOauthToken.access_token))
.enableFeature(window.google.picker.Feature.NAV_HIDDEN)
@ -1193,7 +1189,7 @@
if (!oAuthToken)
{
window.gapi.auth.authorize({
'client_id': AppSettings.settingsGet('GoogleClientID'),
'client_id': Settings.settingsGet('GoogleClientID'),
'scope': 'https://www.googleapis.com/auth/drive.readonly',
'immediate': true
}, function (oAuthResult) {
@ -1208,7 +1204,7 @@
else
{
window.gapi.auth.authorize({
'client_id': AppSettings.settingsGet('GoogleClientID'),
'client_id': Settings.settingsGet('GoogleClientID'),
'scope': 'https://www.googleapis.com/auth/drive.readonly',
'immediate': false
}, function (oAuthResult) {
@ -1261,7 +1257,7 @@
{
var
oUploadCache = {},
iAttachmentSizeLimit = Utils.pInt(AppSettings.settingsGet('AttachmentLimit')),
iAttachmentSizeLimit = Utils.pInt(Settings.settingsGet('AttachmentLimit')),
oJua = new Jua({
'action': LinkBuilder.upload(),
'name': 'uploader',
@ -1510,7 +1506,7 @@
});
};
},
iAttachmentSizeLimit = Utils.pInt(AppSettings.settingsGet('AttachmentLimit')),
iAttachmentSizeLimit = Utils.pInt(Settings.settingsGet('AttachmentLimit')),
mSize = oDropboxFile['bytes']
;
@ -1571,7 +1567,7 @@
});
};
},
iAttachmentSizeLimit = Utils.pInt(AppSettings.settingsGet('AttachmentLimit')),
iAttachmentSizeLimit = Utils.pInt(Settings.settingsGet('AttachmentLimit')),
oAttachment = null,
mSize = oDriveFile['fileSize'] ? Utils.pInt(oDriveFile['fileSize']) : 0
;

39
dev/ViewModels/Popups/PopupsContactsViewModel.js
View file

@ -18,18 +18,16 @@
LinkBuilder = require('LinkBuilder'),
Selector = require('Selector'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote'),
EmailModel = require('../../Models/EmailModel.js'),
ContactModel = require('../../Models/ContactModel.js'),
ContactTagModel = require('../../Models/ContactTagModel.js'),
ContactPropertyModel = require('../../Models/ContactPropertyModel.js'),
EmailModel = require('Model:Email'),
ContactModel = require('Model:Contact'),
ContactTagModel = require('Model:ContactTag'),
ContactPropertyModel = require('Model:ContactProperty'),
PopupsComposeViewModel = require('./PopupsComposeViewModel.js'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -280,8 +278,8 @@
if (Utils.isNonEmptyArray(aE))
{
kn.hideScreenPopup(PopupsContactsViewModel);
kn.showScreenPopup(PopupsComposeViewModel, [Enums.ComposeType.Empty, null, aE]);
kn.hideScreenPopup(require('View:Popup:Contacts'));
kn.showScreenPopup(require('View:Popup:Compose'), [Enums.ComposeType.Empty, null, aE]);
}
}, function () {
@ -351,12 +349,8 @@
this.syncCommand = Utils.createCommand(this, function () {
var
self = this,
App = require('../../Apps/RainLoopApp.js')
;
App.contactsSync(function (sResult, oData) {
var self = this;
require('App:RainLoop').contactsSync(function (sResult, oData) {
if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result)
{
window.alert(Utils.getNotification(
@ -401,8 +395,7 @@
PopupsContactsViewModel.prototype.contactTagsSource = function (oData, fResponse)
{
var App = require('../../Apps/RainLoopApp.js');
App.getContactTagsAutocomplete(oData.term, function (aData) {
require('App:RainLoop').getContactTagsAutocomplete(oData.term, function (aData) {
fResponse(_.map(aData, function (oTagItem) {
return oTagItem.toLine(false);
}));
@ -487,14 +480,12 @@
PopupsContactsViewModel.prototype.exportVcf = function ()
{
var App = require('../../Apps/RainLoopApp.js');
App.download(LinkBuilder.exportContactsVcf());
require('App:RainLoop').download(LinkBuilder.exportContactsVcf());
};
PopupsContactsViewModel.prototype.exportCsv = function ()
{
var App = require('../../Apps/RainLoopApp.js');
App.download(LinkBuilder.exportContactsCsv());
require('App:RainLoop').download(LinkBuilder.exportContactsCsv());
};
PopupsContactsViewModel.prototype.initUploader = function ()

10
dev/ViewModels/Popups/PopupsDomainViewModel.js
View file

@ -12,10 +12,10 @@
Consts = require('Consts'),
Utils = require('Utils'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js'),
Remote = require('Storage:Admin:Remote'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -235,9 +235,7 @@
{
if (oData.Result)
{
var App = require('../../Apps/AdminApp.js');
App.reloadDomainList();
require('App:Admin').reloadDomainList();
this.closeCommand();
}
else if (Enums.Notification.DomainAlreadyExists === oData.ErrorCode)

6
dev/ViewModels/Popups/PopupsFilterViewModel.js
View file

@ -10,10 +10,10 @@
Consts = require('Consts'),
Utils = require('Utils'),
Data = require('../../Storages/WebMailDataStorage.js'),
Data = require('Storage:RainLoop:Data'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**

14
dev/ViewModels/Popups/PopupsFolderClearViewModel.js
View file

@ -10,12 +10,12 @@
Enums = require('Enums'),
Utils = require('Utils'),
Data = require('../../Storages/WebMailDataStorage.js'),
Cache = require('../../Storages/WebMailCacheStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
Data = require('Storage:RainLoop:Data'),
Cache = require('Storage:RainLoop:Cache'),
Remote = require('Storage:RainLoop:Remote'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -26,8 +26,6 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsFolderClear');
var App = require('../../Apps/RainLoopApp.js');
this.selectedFolder = ko.observable(null);
this.clearingProcess = ko.observable(false);
this.clearingError = ko.observable('');
@ -72,7 +70,7 @@
self.clearingProcess(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
App.reloadMessageList(true);
require('App:RainLoop').reloadMessageList(true);
self.cancelCommand();
}
else

11
dev/ViewModels/Popups/PopupsFolderCreateViewModel.js
View file

@ -11,11 +11,11 @@
Consts = require('Consts'),
Utils = require('Utils'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -65,7 +65,6 @@
this.createFolder = Utils.createCommand(this, function () {
var
App = require('../../Apps/RainLoopApp.js'),
sParentFolderName = this.selectedParentValue()
;
@ -80,7 +79,7 @@
Data.foldersCreating(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
App.folders();
require('App:RainLoop').folders();
}
else
{

30
dev/ViewModels/Popups/PopupsFolderSystemViewModel.js
View file

@ -11,12 +11,12 @@
Consts = require('Consts'),
Utils = require('Utils'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
Settings = require('Storage:Settings'),
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -55,11 +55,11 @@
fSaveSystemFolders = _.debounce(function () {
AppSettings.settingsSet('SentFolder', self.sentFolder());
AppSettings.settingsSet('DraftFolder', self.draftFolder());
AppSettings.settingsSet('SpamFolder', self.spamFolder());
AppSettings.settingsSet('TrashFolder', self.trashFolder());
AppSettings.settingsSet('ArchiveFolder', self.archiveFolder());
Settings.settingsSet('SentFolder', self.sentFolder());
Settings.settingsSet('DraftFolder', self.draftFolder());
Settings.settingsSet('SpamFolder', self.spamFolder());
Settings.settingsSet('TrashFolder', self.trashFolder());
Settings.settingsSet('ArchiveFolder', self.archiveFolder());
Remote.saveSystemFolders(Utils.emptyFunction, {
'SentFolder': self.sentFolder(),
@ -74,11 +74,11 @@
fCallback = function () {
AppSettings.settingsSet('SentFolder', self.sentFolder());
AppSettings.settingsSet('DraftFolder', self.draftFolder());
AppSettings.settingsSet('SpamFolder', self.spamFolder());
AppSettings.settingsSet('TrashFolder', self.trashFolder());
AppSettings.settingsSet('ArchiveFolder', self.archiveFolder());
Settings.settingsSet('SentFolder', self.sentFolder());
Settings.settingsSet('DraftFolder', self.draftFolder());
Settings.settingsSet('SpamFolder', self.spamFolder());
Settings.settingsSet('TrashFolder', self.trashFolder());
Settings.settingsSet('ArchiveFolder', self.archiveFolder());
fSaveSystemFolders();
};

12
dev/ViewModels/Popups/PopupsIdentityViewModel.js
View file

@ -9,12 +9,12 @@
Enums = require('Enums'),
Utils = require('Utils'),
kn = require('kn'),
kn = require('App:Knoin'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('Storage:RainLoop:Remote'),
Data = require('Storage:RainLoop:Data'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -25,8 +25,6 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsIdentity');
var App = require('../../Apps/RainLoopApp.js');
this.id = '';
this.edit = ko.observable(false);
this.owner = ko.observable(false);
@ -85,7 +83,7 @@
{
if (oData.Result)
{
App.accountsAndIdentities();
require('App:RainLoop').accountsAndIdentities();
this.cancelCommand();
}
else if (oData.ErrorCode)

4
dev/ViewModels/Popups/PopupsKeyboardShortcutsHelpViewModel.js
View file

@ -10,8 +10,8 @@
Enums = require('Enums'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**

6
dev/ViewModels/Popups/PopupsLanguagesViewModel.js
View file

@ -10,10 +10,10 @@
Utils = require('Utils'),
Data = require('../../Storages/WebMailDataStorage.js'),
Data = require('Storage:RainLoop:Data'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**

24
dev/ViewModels/Popups/PopupsGenerateNewOpenPgpKeyViewModel.js → dev/ViewModels/Popups/PopupsNewOpenPgpKeyViewModel.js
View file

@ -11,21 +11,19 @@
Utils = require('Utils'),
Data = require('../../Storages/WebMailDataStorage.js'),
Data = require('Storage:RainLoop:Data'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
* @constructor
* @extends KnoinAbstractViewModel
*/
function PopupsGenerateNewOpenPgpKeyViewModel()
function PopupsNewOpenPgpKeyViewModel()
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsGenerateNewOpenPgpKey');
var App = require('../../Apps/RainLoopApp.js');
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsNewOpenPgpKey');
this.email = ko.observable('');
this.email.focus = ko.observable('');
@ -78,7 +76,7 @@
oOpenpgpKeyring.publicKeys.importKey(mKeyPair.publicKeyArmored);
oOpenpgpKeyring.store();
App.reloadOpenPgpKeys();
require('App:RainLoop').reloadOpenPgpKeys();
Utils.delegateRun(self, 'cancelCommand');
}
@ -91,9 +89,9 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsGenerateNewOpenPgpKeyViewModel', PopupsGenerateNewOpenPgpKeyViewModel);
kn.extendAsViewModel('PopupsNewOpenPgpKeyViewModel', PopupsNewOpenPgpKeyViewModel);
PopupsGenerateNewOpenPgpKeyViewModel.prototype.clearPopup = function ()
PopupsNewOpenPgpKeyViewModel.prototype.clearPopup = function ()
{
this.name('');
this.password('');
@ -103,16 +101,16 @@
this.keyBitLength(2048);
};
PopupsGenerateNewOpenPgpKeyViewModel.prototype.onShow = function ()
PopupsNewOpenPgpKeyViewModel.prototype.onShow = function ()
{
this.clearPopup();
};
PopupsGenerateNewOpenPgpKeyViewModel.prototype.onFocus = function ()
PopupsNewOpenPgpKeyViewModel.prototype.onFocus = function ()
{
this.email.focus(true);
};
module.exports = PopupsGenerateNewOpenPgpKeyViewModel;
module.exports = PopupsNewOpenPgpKeyViewModel;
}(module, require));

14
dev/ViewModels/Popups/PopupsPluginViewModel.js
View file

@ -12,12 +12,10 @@
Enums = require('Enums'),
Utils = require('Utils'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js'),
Remote = require('Storage:Admin:Remote'),
PopupsAskViewModel = require('./PopupsAskViewModel.js'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**
@ -139,7 +137,11 @@
PopupsPluginViewModel.prototype.tryToClosePopup = function ()
{
var self = this;
var
self = this,
PopupsAskViewModel = require('View:Popup:Ask')
;
if (!kn.isPopupVisible(PopupsAskViewModel))
{
kn.showScreenPopup(PopupsAskViewModel, [Utils.i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'), function () {

6
dev/ViewModels/Popups/PopupsTwoFactorTestViewModel.js
View file

@ -10,10 +10,10 @@
Enums = require('Enums'),
Utils = require('Utils'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
Remote = require('Storage:RainLoop:Remote'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**

4
dev/ViewModels/Popups/PopupsViewOpenPgpKeyViewModel.js
View file

@ -9,8 +9,8 @@
Utils = require('Utils'),
kn = require('kn'),
KnoinAbstractViewModel = require('KnoinAbstractViewModel')
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
/**