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

Code refactoring (4) (es5 -> es2015)

Browse source
This commit is contained in:
RainLoop Team 2016-07-15 22:54:37 +03:00
parent e8df1cdb57
commit d7ab67a460
30 changed files with 164 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

38
dev/Screen/Admin/Settings.jsx
View file

@ -1,12 +1,20 @@
/* global RL_COMMUNITY */
import {addSettingsViewModel} from 'Knoin/Knoin';
import {runSettingsViewModelHooks} from 'Common/Plugins';
import {AbstractSettingsScreen} from 'Screen/AbstractSettings';
import App from 'App/Admin';
import {GeneralAdminSettings} from 'Settings/Admin/General';
import {LoginAdminSettings} from 'Settings/Admin/Login';
import {ContactsAdminSettings} from 'Settings/Admin/Contacts';
import {DomainsAdminSettings} from 'Settings/Admin/Domains';
import {SecurityAdminSettings} from 'Settings/Admin/Security';
import {SocialAdminSettings} from 'Settings/Admin/Social';
import {PluginsAdminSettings} from 'Settings/Admin/Plugins';
import {PackagesAdminSettings} from 'Settings/Admin/Packages';
// import {AboutAdminSettings} from 'Settings/Admin/About';
class SettingsAdminScreen extends AbstractSettingsScreen
{
constructor()
@ -21,49 +29,49 @@ class SettingsAdminScreen extends AbstractSettingsScreen
* @param {Function=} fCallback = null
*/
setupSettings(fCallback = null) {
addSettingsViewModel(require('Settings/Admin/General'),
addSettingsViewModel(GeneralAdminSettings,
'AdminSettingsGeneral', 'TABS_LABELS/LABEL_GENERAL_NAME', 'general', true);
addSettingsViewModel(require('Settings/Admin/Login'),
addSettingsViewModel(LoginAdminSettings,
'AdminSettingsLogin', 'TABS_LABELS/LABEL_LOGIN_NAME', 'login');
if (RL_COMMUNITY)
{
addSettingsViewModel(require('Settings/Admin/Branding'),
addSettingsViewModel(require('Settings/Admin/Branding').default,
'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding');
}
else
{
addSettingsViewModel(require('Settings/Admin/Prem/Branding'),
addSettingsViewModel(require('Settings/Admin/Prem/Branding').default,
'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding');
}
addSettingsViewModel(require('Settings/Admin/Contacts'),
addSettingsViewModel(ContactsAdminSettings,
'AdminSettingsContacts', 'TABS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
addSettingsViewModel(require('Settings/Admin/Domains'),
addSettingsViewModel(DomainsAdminSettings,
'AdminSettingsDomains', 'TABS_LABELS/LABEL_DOMAINS_NAME', 'domains');
addSettingsViewModel(require('Settings/Admin/Security'),
addSettingsViewModel(SecurityAdminSettings,
'AdminSettingsSecurity', 'TABS_LABELS/LABEL_SECURITY_NAME', 'security');
addSettingsViewModel(require('Settings/Admin/Social'),
addSettingsViewModel(SocialAdminSettings,
'AdminSettingsSocial', 'TABS_LABELS/LABEL_INTEGRATION_NAME', 'integrations');
addSettingsViewModel(require('Settings/Admin/Plugins'),
addSettingsViewModel(PluginsAdminSettings,
'AdminSettingsPlugins', 'TABS_LABELS/LABEL_PLUGINS_NAME', 'plugins');
addSettingsViewModel(require('Settings/Admin/Packages'),
addSettingsViewModel(PackagesAdminSettings,
'AdminSettingsPackages', 'TABS_LABELS/LABEL_PACKAGES_NAME', 'packages');
if (!RL_COMMUNITY)
{
addSettingsViewModel(require('Settings/Admin/Prem/Licensing'),
addSettingsViewModel(require('Settings/Admin/Prem/Licensing').default,
'AdminSettingsLicensing', 'TABS_LABELS/LABEL_LICENSING_NAME', 'licensing');
}
addSettingsViewModel(require('Settings/Admin/About'),
'AdminSettingsAbout', 'TABS_LABELS/LABEL_ABOUT_NAME', 'about');
// addSettingsViewModel(AboutAdminSettings,
// 'AdminSettingsAbout', 'TABS_LABELS/LABEL_ABOUT_NAME', 'about');
runSettingsViewModelHooks(true);

34
dev/Screen/User/Settings.jsx
View file

@ -13,6 +13,18 @@ import {addSettingsViewModel} from 'Knoin/Knoin';
import {AbstractSettingsScreen} from 'Screen/AbstractSettings';
import App from 'App/User';
import {GeneralUserSettings} from 'Settings/User/General';
import {ContactsUserSettings} from 'Settings/User/Contacts';
import {AccountsUserSettings} from 'Settings/User/Accounts';
import {FiltersUserSettings} from 'Settings/User/Filters';
import {SecurityUserSettings} from 'Settings/User/Security';
import {SocialUserSettings} from 'Settings/User/Social';
import {ChangePasswordUserSettings} from 'Settings/User/ChangePassword';
import {TemplatesUserSettings} from 'Settings/User/Templates';
import {FoldersUserSettings} from 'Settings/User/Folders';
import {ThemesUserSettings} from 'Settings/User/Themes';
import {OpenPgpUserSettings} from 'Settings/User/OpenPgp';
class SettingsUserScreen extends AbstractSettingsScreen
{
constructor()
@ -44,30 +56,30 @@ class SettingsUserScreen extends AbstractSettingsScreen
return false;
}
addSettingsViewModel(require('Settings/User/General'),
addSettingsViewModel(GeneralUserSettings,
'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
if (AppStore.contactsIsAllowed())
{
addSettingsViewModel(require('Settings/User/Contacts'),
addSettingsViewModel(ContactsUserSettings,
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
if (Settings.capa(Capa.AdditionalAccounts) || Settings.capa(Capa.Identities))
{
addSettingsViewModel(require('Settings/User/Accounts'), 'SettingsAccounts',
addSettingsViewModel(AccountsUserSettings, 'SettingsAccounts',
Settings.capa(Capa.AdditionalAccounts) ? 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME' : 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'accounts');
}
if (Settings.capa(Capa.Sieve))
{
addSettingsViewModel(require('Settings/User/Filters'),
addSettingsViewModel(FiltersUserSettings,
'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
}
if (Settings.capa(Capa.AutoLogout) || Settings.capa(Capa.TwoFactor))
{
addSettingsViewModel(require('Settings/User/Security'),
addSettingsViewModel(SecurityUserSettings,
'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
}
@ -76,37 +88,37 @@ class SettingsUserScreen extends AbstractSettingsScreen
Settings.settingsGet('AllowFacebookSocial') ||
Settings.settingsGet('AllowTwitterSocial')))
{
addSettingsViewModel(require('Settings/User/Social'),
addSettingsViewModel(SocialUserSettings,
'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
}
if (Settings.settingsGet('ChangePasswordIsAllowed'))
{
addSettingsViewModel(require('Settings/User/ChangePassword'),
addSettingsViewModel(ChangePasswordUserSettings,
'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
}
if (Settings.capa(Capa.Templates))
{
addSettingsViewModel(require('Settings/User/Templates'),
addSettingsViewModel(TemplatesUserSettings,
'SettingsTemplates', 'SETTINGS_LABELS/LABEL_TEMPLATES_NAME', 'templates');
}
if (Settings.capa(Capa.Folders))
{
addSettingsViewModel(require('Settings/User/Folders'),
addSettingsViewModel(FoldersUserSettings,
'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
}
if (Settings.capa(Capa.Themes))
{
addSettingsViewModel(require('Settings/User/Themes'),
addSettingsViewModel(ThemesUserSettings,
'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
}
if (Settings.capa(Capa.OpenPGP))
{
addSettingsViewModel(require('Settings/User/OpenPgp'),
addSettingsViewModel(OpenPgpUserSettings,
'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
}