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

Code refactoring

Browse source
This commit is contained in:
RainLoop Team 2015-02-22 02:00:51 +04:00
parent bf56821c2d
commit 31860420cb
32 changed files with 1342 additions and 1282 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dev/Settings/User/Contacts.js
View file

@ -7,9 +7,9 @@
ko = require('ko'),
AppStore = require('Stores/User/App'),
ContactStore = require('Stores/User/Contact'),
Remote = require('Storage/User/Remote'),
Data = require('Storage/User/Data')
Remote = require('Storage/User/Remote')
;
/**
@ -19,11 +19,11 @@
{
this.contactsAutosave = AppStore.contactsAutosave;
this.allowContactsSync = Data.allowContactsSync;
this.enableContactsSync = Data.enableContactsSync;
this.contactsSyncUrl = Data.contactsSyncUrl;
this.contactsSyncUser = Data.contactsSyncUser;
this.contactsSyncPass = Data.contactsSyncPass;
this.allowContactsSync = ContactStore.allowContactsSync;
this.enableContactsSync = ContactStore.enableContactsSync;
this.contactsSyncUrl = ContactStore.contactsSyncUrl;
this.contactsSyncUser = ContactStore.contactsSyncUser;
this.contactsSyncPass = ContactStore.contactsSyncPass;
this.saveTrigger = ko.computed(function () {
return [

31
dev/Settings/User/Folders.js
View file

@ -10,8 +10,9 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
FolderStore = require('Stores/User/Folder'),
Settings = require('Storage/Settings'),
Data = require('Storage/User/Data'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
Local = require('Storage/Client')
@ -22,15 +23,15 @@
*/
function FoldersUserSettings()
{
this.folderList = Data.folderList;
this.folderList = FolderStore.folderList;
this.loading = ko.computed(function () {
var
bLoading = Data.foldersLoading(),
bCreating = Data.foldersCreating(),
bDeleting = Data.foldersDeleting(),
bRenaming = Data.foldersRenaming()
bLoading = FolderStore.foldersLoading(),
bCreating = FolderStore.foldersCreating(),
bDeleting = FolderStore.foldersDeleting(),
bRenaming = FolderStore.foldersRenaming()
;
return bLoading || bCreating || bDeleting || bRenaming;
@ -66,13 +67,13 @@
{
Local.set(Enums.ClientSideKeyName.FoldersLashHash, '');
Data.foldersRenaming(true);
FolderStore.foldersRenaming(true);
Remote.folderRename(function (sResult, oData) {
Data.foldersRenaming(false);
FolderStore.foldersRenaming(false);
if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result)
{
Data.folderList.error(
FolderStore.folderList.error(
oData && oData.ErrorCode ? Translator.getNotification(oData.ErrorCode) : Translator.i18n('NOTIFICATIONS/CANT_RENAME_FOLDER'));
}
@ -98,7 +99,7 @@
FoldersUserSettings.prototype.onShow = function ()
{
Data.folderList.error('');
FolderStore.folderList.error('');
};
FoldersUserSettings.prototype.createFolder = function ()
@ -135,15 +136,15 @@
{
Local.set(Enums.ClientSideKeyName.FoldersLashHash, '');
Data.folderList.remove(fRemoveFolder);
FolderStore.folderList.remove(fRemoveFolder);
Data.foldersDeleting(true);
FolderStore.foldersDeleting(true);
Remote.folderDelete(function (sResult, oData) {
Data.foldersDeleting(false);
FolderStore.foldersDeleting(false);
if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result)
{
Data.folderList.error(
FolderStore.folderList.error(
oData && oData.ErrorCode ? Translator.getNotification(oData.ErrorCode) : Translator.i18n('NOTIFICATIONS/CANT_DELETE_FOLDER'));
}
@ -156,7 +157,7 @@
}
else if (0 < oFolderToRemove.privateMessageCountAll())
{
Data.folderList.error(Translator.getNotification(Enums.Notification.CantDeleteNonEmptyFolder));
FolderStore.folderList.error(Translator.getNotification(Enums.Notification.CantDeleteNonEmptyFolder));
}
};

6
dev/Settings/User/General.js
View file

@ -17,8 +17,8 @@
LanguageStore = require('Stores/Language'),
SettingsStore = require('Stores/User/Settings'),
NotificationStore = require('Stores/User/Notification'),
MessageStore = require('Stores/User/Message'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote')
;
@ -163,7 +163,7 @@
self.useThreads.subscribe(function (bValue) {
Data.messageList([]);
MessageStore.messageList([]);
Remote.saveSettings(null, {
'UseThreads': bValue ? '1' : '0'
@ -172,7 +172,7 @@
self.layout.subscribe(function (nValue) {
Data.messageList([]);
MessageStore.messageList([]);
Remote.saveSettings(f2, {
'Layout': nValue