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

Sound notification

Browse source 
Additional code refactoring
This commit is contained in:
RainLoop Team 2015-01-27 01:06:00 +04:00
parent b42ce01e7e
commit aa84077ac4
87 changed files with 1573 additions and 574 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dev/View/User/Login.js
View file

@ -17,7 +17,8 @@
Plugins = require('Common/Plugins'),
UserSettingsStore = require('Stores/UserSettings'),
LanguageStore = require('Stores/Language'),
AppStore = require('Stores/User/App'),
Settings = require('Storage/Settings'),
Data = require('Storage/User/Data'),
@ -88,10 +89,10 @@
}
}, this);
this.allowLanguagesOnLogin = Data.allowLanguagesOnLogin;
this.allowLanguagesOnLogin = AppStore.allowLanguagesOnLogin;
this.langRequest = ko.observable(false);
this.language = UserSettingsStore.language;
this.language = LanguageStore.language;
this.bSendLanguage = false;
@ -307,7 +308,7 @@
if (Settings.settingsGet('UserLanguage'))
{
$.cookie('rllang', UserSettingsStore.language(), {'expires': 30});
$.cookie('rllang', LanguageStore.language(), {'expires': 30});
}
}, this), 100);
@ -376,7 +377,7 @@
}
_.delay(function () {
UserSettingsStore.language.subscribe(function (sValue) {
LanguageStore.language.subscribe(function (sValue) {
self.langRequest(true);

8
dev/View/User/MailBox/FolderList.js
View file

@ -15,9 +15,9 @@
Globals = require('Common/Globals'),
Links = require('Common/Links'),
UserSettingsStore = require('Stores/UserSettings'),
AppStore = require('Stores/User/App'),
SettingsUserStore = require('Stores/User/Settings'),
Settings = require('Storage/Settings'),
Cache = require('Storage/User/Cache'),
Data = require('Storage/User/Data'),
@ -47,7 +47,7 @@
this.iDropOverTimer = 0;
this.allowContacts = !!Settings.settingsGet('ContactsIsAllowed');
this.allowContacts = !!AppStore.contactsIsAllowed();
kn.constructorEnd(this);
}
@ -90,7 +90,7 @@
if (oFolder)
{
if (Enums.Layout.NoPreview === UserSettingsStore.layout())
if (Enums.Layout.NoPreview === SettingsUserStore.layout())
{
Data.message(null);
}

20
dev/View/User/MailBox/MessageList.js
View file

@ -20,8 +20,8 @@
Selector = require('Common/Selector'),
Translator = require('Common/Translator'),
QuotaStore = require('Stores/Quota'),
UserSettingsStore = require('Stores/UserSettings'),
QuotaStore = require('Stores/User/Quota'),
SettingsStore = require('Stores/User/Settings'),
Settings = require('Storage/Settings'),
Cache = require('Storage/User/Cache'),
@ -57,7 +57,7 @@
this.messageListError = Data.messageListError;
this.folderMenuForMove = Data.folderMenuForMove;
this.useCheckboxesInList = Data.useCheckboxesInList;
this.useCheckboxesInList = SettingsStore.useCheckboxesInList;
this.mainMessageListSearch = Data.mainMessageListSearch;
this.messageListEndFolder = Data.messageListEndFolder;
@ -85,7 +85,7 @@
this.dragOverBodyArea = ko.observable(null);
this.messageListItemTemplate = ko.computed(function () {
return Enums.Layout.SidePreview === UserSettingsStore.layout() ?
return Enums.Layout.SidePreview === SettingsStore.layout() ?
'MailMessageListItem' : 'MailMessageListItemNoPreviewPane';
});
@ -231,7 +231,7 @@
Data.message(Data.staticMessageList.populateByMessageListItem(oMessage));
this.populateMessageBody(Data.message());
if (Enums.Layout.NoPreview === UserSettingsStore.layout())
if (Enums.Layout.NoPreview === SettingsStore.layout())
{
kn.setHash(Links.messagePreview(), true);
Data.message.focused(true);
@ -251,11 +251,11 @@
this.selector.scrollToTop();
}, this);
UserSettingsStore.layout.subscribe(function (mValue) {
SettingsStore.layout.subscribe(function (mValue) {
this.selector.autoSelect(Enums.Layout.NoPreview !== mValue);
}, this);
UserSettingsStore.layout.valueHasMutated();
SettingsStore.layout.valueHasMutated();
Events
.sub('mailbox.message-list.selector.go-down', function () {
@ -815,14 +815,12 @@
return false;
});
// TODO
key('ctrl+left, command+left', Enums.KeyState.MessageView, function () {
return false;
return false; // TODO
});
// TODO
key('ctrl+right, command+right', Enums.KeyState.MessageView, function () {
return false;
return false; // TODO
});
};

12
dev/View/User/MailBox/MessageView.js
View file

@ -19,9 +19,9 @@
Events = require('Common/Events'),
Translator = require('Common/Translator'),
UserSettingsStore = require('Stores/UserSettings'),
SettingsUserStore = require('Stores/User/Settings'),
Local = require('Storage/Local'),
Local = require('Storage/Client'),
Cache = require('Storage/User/Cache'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
@ -62,10 +62,10 @@
this.messageLoading = Data.messageLoading;
this.messageLoadingThrottle = Data.messageLoadingThrottle;
this.messagesBodiesDom = Data.messagesBodiesDom;
this.useThreads = Data.useThreads;
this.replySameFolder = Data.replySameFolder;
this.layout = UserSettingsStore.layout;
this.usePreviewPane = UserSettingsStore.usePreviewPane;
this.useThreads = SettingsUserStore.useThreads;
this.replySameFolder = SettingsUserStore.replySameFolder;
this.layout = SettingsUserStore.layout;
this.usePreviewPane = SettingsUserStore.usePreviewPane;
this.isMessageSelected = Data.isMessageSelected;
this.messageActiveDom = Data.messageActiveDom;
this.messageError = Data.messageError;