mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-29 20:19:22 +03:00
Sound notification
Additional code refactoring
This commit is contained in:
parent
b42ce01e7e
commit
aa84077ac4
87 changed files with 1573 additions and 574 deletions
|
|
@ -12,7 +12,7 @@
|
|||
Events = require('Common/Events'),
|
||||
Translator = require('Common/Translator'),
|
||||
|
||||
UserSettingsStore = require('Stores/UserSettings'),
|
||||
SettingsUserStore = require('Stores/User/Settings'),
|
||||
|
||||
Data = require('Storage/User/Data'),
|
||||
Cache = require('Storage/User/Cache'),
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
{
|
||||
if (Utils.isUnd(bPreview) ? false : !!bPreview)
|
||||
{
|
||||
if (Enums.Layout.NoPreview === UserSettingsStore.layout() && !Data.message())
|
||||
if (Enums.Layout.NoPreview === SettingsUserStore.layout() && !Data.message())
|
||||
{
|
||||
require('App/User').historyBack();
|
||||
}
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
.messageListSearch(sSearch)
|
||||
;
|
||||
|
||||
if (Enums.Layout.NoPreview === UserSettingsStore.layout() && Data.message())
|
||||
if (Enums.Layout.NoPreview === SettingsUserStore.layout() && Data.message())
|
||||
{
|
||||
Data.message(null);
|
||||
}
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
Data.messageList.subscribe(Utils.windowResizeCallback);
|
||||
Data.message.subscribe(Utils.windowResizeCallback);
|
||||
|
||||
UserSettingsStore.layout.subscribe(function (nValue) {
|
||||
SettingsUserStore.layout.subscribe(function (nValue) {
|
||||
|
||||
Globals.$html.toggleClass('rl-no-preview-pane', Enums.Layout.NoPreview === nValue);
|
||||
Globals.$html.toggleClass('rl-side-preview-pane', Enums.Layout.SidePreview === nValue);
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
Events.pub('layout', [nValue]);
|
||||
});
|
||||
|
||||
UserSettingsStore.layout.valueHasMutated();
|
||||
SettingsUserStore.layout.valueHasMutated();
|
||||
|
||||
Events.sub('mailbox.inbox-unread-count', function (nCount) {
|
||||
Data.foldersInboxUnreadCount(nCount);
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
Globals = require('Common/Globals'),
|
||||
Translator = require('Common/Translator'),
|
||||
|
||||
AppStore = require('Stores/User/App'),
|
||||
Settings = require('Storage/Settings'),
|
||||
|
||||
kn = require('Knoin/Knoin'),
|
||||
|
|
@ -46,7 +47,7 @@
|
|||
kn.addSettingsViewModel(require('Settings/User/General'),
|
||||
'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
|
||||
|
||||
if (Settings.settingsGet('ContactsIsAllowed'))
|
||||
if (AppStore.contactsIsAllowed())
|
||||
{
|
||||
kn.addSettingsViewModel(require('Settings/User/Contacts'),
|
||||
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue