From 1535dd00f133aa24adff90105dadbc66b201e0c4 Mon Sep 17 00:00:00 2001 From: djmaze Date: Fri, 22 Jan 2021 16:32:08 +0100 Subject: [PATCH] cleanup webpack export references --- dev/App/Abstract.js | 4 +-- dev/Common/Selector.js | 4 +-- dev/Component/AbstractCheckbox.js | 2 +- dev/Component/AbstractInput.js | 2 +- dev/Knoin/Knoin.js | 31 ++++++++----------- dev/Model/Account.js | 4 +-- dev/Model/Attachment.js | 4 +-- dev/Model/ComposeAttachment.js | 4 +-- dev/Model/Contact.js | 4 +-- dev/Model/ContactProperty.js | 4 +-- dev/Model/Filter.js | 4 +-- dev/Model/FilterCondition.js | 4 +-- dev/Model/Folder.js | 4 +-- dev/Model/Identity.js | 4 +-- dev/Model/Message.js | 4 +-- dev/Model/OpenPgpKey.js | 4 +-- dev/Model/SieveScript.js | 4 +-- dev/Model/Template.js | 4 +-- dev/Screen/AbstractSettings.js | 4 +-- dev/Screen/Admin/Login.js | 4 +-- dev/Screen/Admin/Settings.js | 39 ++++++++++++------------ dev/Screen/User/Login.js | 4 +-- dev/Screen/User/MailBox.js | 4 +-- dev/Screen/User/Settings.js | 4 +-- dev/Settings/Admin/About.js | 4 +-- dev/Settings/Admin/Branding.js | 4 +-- dev/Settings/Admin/Contacts.js | 4 +-- dev/Settings/Admin/Domains.js | 4 +-- dev/Settings/Admin/General.js | 4 +-- dev/Settings/Admin/Login.js | 4 +-- dev/Settings/Admin/Packages.js | 4 +-- dev/Settings/Admin/Plugins.js | 4 +-- dev/Settings/Admin/Security.js | 4 +-- dev/Settings/User/Accounts.js | 4 +-- dev/Settings/User/Contacts.js | 4 +-- dev/Settings/User/Filters.js | 4 +-- dev/Settings/User/Folders.js | 4 +-- dev/Settings/User/General.js | 4 +-- dev/Settings/User/OpenPgp.js | 4 +-- dev/Settings/User/Security.js | 4 +-- dev/Settings/User/Templates.js | 4 +-- dev/Settings/User/Themes.js | 4 +-- dev/View/Admin/Login.js | 2 +- dev/View/Admin/Settings/Menu.js | 2 +- dev/View/Admin/Settings/Pane.js | 2 +- dev/View/User/AbstractSystemDropDown.js | 4 +-- dev/View/User/Login.js | 2 +- dev/View/User/MailBox/FolderList.js | 2 +- dev/View/User/MailBox/MessageList.js | 2 +- dev/View/User/MailBox/MessageView.js | 2 +- dev/View/User/MailBox/SystemDropDown.js | 2 +- dev/View/User/Settings/Menu.js | 2 +- dev/View/User/Settings/Pane.js | 2 +- dev/View/User/Settings/SystemDropDown.js | 2 +- 54 files changed, 84 insertions(+), 168 deletions(-) diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js index 87f71df2c..8857004e7 100644 --- a/dev/App/Abstract.js +++ b/dev/App/Abstract.js @@ -15,7 +15,7 @@ import ThemeStore from 'Stores/Theme'; const Settings = rl.settings, doc = document; -class AbstractApp { +export class AbstractApp { /** * @param {RemoteStorage|AdminRemoteStorage} Remote */ @@ -130,5 +130,3 @@ class AbstractApp { } } - -export { AbstractApp, AbstractApp as default }; diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js index 1a8159cc9..12020e1d5 100644 --- a/dev/Common/Selector.js +++ b/dev/Common/Selector.js @@ -1,6 +1,6 @@ import ko from 'ko'; -class Selector { +export class Selector { list; listChecked; isListChecked; @@ -516,5 +516,3 @@ class Selector { this.scrollToFocused(); } } - -export { Selector, Selector as default }; diff --git a/dev/Component/AbstractCheckbox.js b/dev/Component/AbstractCheckbox.js index 485f59109..146d73eaa 100644 --- a/dev/Component/AbstractCheckbox.js +++ b/dev/Component/AbstractCheckbox.js @@ -37,4 +37,4 @@ class AbstractCheckbox extends AbstractComponent { } } -export { AbstractCheckbox, AbstractCheckbox as default }; +export { AbstractCheckbox }; diff --git a/dev/Component/AbstractInput.js b/dev/Component/AbstractInput.js index e043b5501..57ac7aa16 100644 --- a/dev/Component/AbstractInput.js +++ b/dev/Component/AbstractInput.js @@ -58,4 +58,4 @@ class AbstractInput extends AbstractComponent { } } -export { AbstractInput, AbstractInput as default }; +export { AbstractInput }; diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js index 79cbf8bcc..6aa2b03c4 100644 --- a/dev/Knoin/Knoin.js +++ b/dev/Knoin/Knoin.js @@ -188,25 +188,26 @@ function buildViewModel(ViewModelClass, vmScreen) { return ViewModelClass ? ViewModelClass.__vm : null; } +function getScreenPopupViewModel(ViewModelClassToShow) { + const ModalView = getScreenPopup(ViewModelClassToShow); + return (buildViewModel(ModalView) && ModalView.__dom) ? ModalView.__vm : null; +} + /** * @param {Function} ViewModelClassToShow * @param {Array=} params * @returns {void} */ export function showScreenPopup(ViewModelClassToShow, params = []) { - const ModalView = getScreenPopup(ViewModelClassToShow); - if (ModalView) { - buildViewModel(ModalView); + const vm = getScreenPopupViewModel(ViewModelClassToShow); + if (vm) { + params = params || []; - if (ModalView.__vm && ModalView.__dom) { - params = params || []; + vm.onBeforeShow && vm.onBeforeShow(...params); - ModalView.__vm.onBeforeShow && ModalView.__vm.onBeforeShow(...params); + vm.modalVisibility(true); - ModalView.__vm.modalVisibility(true); - - ModalView.__vm.onShow && ModalView.__vm.onShow(...params); - } + vm.onShow && vm.onShow(...params); } } @@ -215,14 +216,8 @@ export function showScreenPopup(ViewModelClassToShow, params = []) { * @returns {void} */ export function warmUpScreenPopup(ViewModelClassToShow) { - const ModalView = getScreenPopup(ViewModelClassToShow); - if (ModalView) { - buildViewModel(ModalView); - - if (ModalView.__vm && ModalView.__dom) { - ModalView.__vm.onWarmUp && ModalView.__vm.onWarmUp(); - } - } + const vm = getScreenPopupViewModel(ViewModelClassToShow); + vm && vm.onWarmUp && vm.onWarmUp(); } /** diff --git a/dev/Model/Account.js b/dev/Model/Account.js index daa843f9d..c0789b790 100644 --- a/dev/Model/Account.js +++ b/dev/Model/Account.js @@ -2,7 +2,7 @@ import { change } from 'Common/Links'; import { AbstractModel } from 'Knoin/AbstractModel'; -class AccountModel extends AbstractModel { +export class AccountModel extends AbstractModel { /** * @param {string} email * @param {boolean=} canBeDelete = true @@ -28,5 +28,3 @@ class AccountModel extends AbstractModel { return change(this.email); } } - -export { AccountModel, AccountModel as default }; diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js index 1ff48eddd..243cd7521 100644 --- a/dev/Model/Attachment.js +++ b/dev/Model/Attachment.js @@ -15,7 +15,7 @@ import Audio from 'Common/Audio'; const bAllowPdfPreview = undefined !== navigator.mimeTypes['application/pdf']; -class AttachmentModel extends AbstractModel { +export class AttachmentModel extends AbstractModel { constructor() { super(); @@ -231,5 +231,3 @@ class AttachmentModel extends AbstractModel { return File.getTypeIconClass(this.fileType)[1]; } } - -export { AttachmentModel, AttachmentModel as default }; diff --git a/dev/Model/ComposeAttachment.js b/dev/Model/ComposeAttachment.js index 8bc92ccf3..112cda8cc 100644 --- a/dev/Model/ComposeAttachment.js +++ b/dev/Model/ComposeAttachment.js @@ -3,7 +3,7 @@ import { File } from 'Common/File'; import { AbstractModel } from 'Knoin/AbstractModel'; -class ComposeAttachmentModel extends AbstractModel { +export class ComposeAttachmentModel extends AbstractModel { /** * @param {string} id * @param {string} fileName @@ -106,5 +106,3 @@ class ComposeAttachmentModel extends AbstractModel { return File.getIconClass(this.fileExt(), this.mimeType())[1]; } } - -export { ComposeAttachmentModel, ComposeAttachmentModel as default }; diff --git a/dev/Model/Contact.js b/dev/Model/Contact.js index c669a7e2d..5c6ed7ca5 100644 --- a/dev/Model/Contact.js +++ b/dev/Model/Contact.js @@ -3,7 +3,7 @@ import { ContactPropertyType } from 'Common/Enums'; import { AbstractModel } from 'Knoin/AbstractModel'; -class ContactModel extends AbstractModel { +export class ContactModel extends AbstractModel { constructor() { super(); @@ -122,5 +122,3 @@ class ContactModel extends AbstractModel { return result.join(' '); } } - -export { ContactModel, ContactModel as default }; diff --git a/dev/Model/ContactProperty.js b/dev/Model/ContactProperty.js index 5950fa28b..20b4adc67 100644 --- a/dev/Model/ContactProperty.js +++ b/dev/Model/ContactProperty.js @@ -6,7 +6,7 @@ import { AbstractModel } from 'Knoin/AbstractModel'; const trim = text => null == text ? "" : (text + "").trim(); -class ContactPropertyModel extends AbstractModel { +export class ContactPropertyModel extends AbstractModel { /** * @param {number=} type = Enums.ContactPropertyType.Unknown * @param {string=} typeStr = '' @@ -54,5 +54,3 @@ class ContactPropertyModel extends AbstractModel { // static reviveFromJson(json) {} } - -export { ContactPropertyModel, ContactPropertyModel as default }; diff --git a/dev/Model/Filter.js b/dev/Model/Filter.js index e398d77b1..2c06d6c14 100644 --- a/dev/Model/Filter.js +++ b/dev/Model/Filter.js @@ -11,7 +11,7 @@ import AccountStore from 'Stores/User/Account'; import { FilterConditionModel } from 'Model/FilterCondition'; import { AbstractModel } from 'Knoin/AbstractModel'; -class FilterModel extends AbstractModel { +export class FilterModel extends AbstractModel { constructor() { super(); @@ -264,5 +264,3 @@ class FilterModel extends AbstractModel { return filter; } } - -export { FilterModel, FilterModel as default }; diff --git a/dev/Model/FilterCondition.js b/dev/Model/FilterCondition.js index 239227862..15c0b68e7 100644 --- a/dev/Model/FilterCondition.js +++ b/dev/Model/FilterCondition.js @@ -4,7 +4,7 @@ import { FilterConditionField, FilterConditionType } from 'Common/Enums'; import { AbstractModel } from 'Knoin/AbstractModel'; -class FilterConditionModel extends AbstractModel { +export class FilterConditionModel extends AbstractModel { constructor() { super(); @@ -83,5 +83,3 @@ class FilterConditionModel extends AbstractModel { return filterCond; } } - -export { FilterConditionModel, FilterConditionModel as default }; diff --git a/dev/Model/Folder.js b/dev/Model/Folder.js index f06ee9c1d..553840e88 100644 --- a/dev/Model/Folder.js +++ b/dev/Model/Folder.js @@ -7,7 +7,7 @@ import { i18n, trigger as translatorTrigger } from 'Common/Translator'; import { AbstractModel } from 'Knoin/AbstractModel'; import { FolderCollectionModel } from 'Model/FolderCollection'; -class FolderModel extends AbstractModel { +export class FolderModel extends AbstractModel { constructor() { super(); @@ -255,5 +255,3 @@ class FolderModel extends AbstractModel { return this.fullName.split(this.delimiter).join(' / '); } } - -export { FolderModel, FolderModel as default }; diff --git a/dev/Model/Identity.js b/dev/Model/Identity.js index fefe6aa55..3fa72b9f4 100644 --- a/dev/Model/Identity.js +++ b/dev/Model/Identity.js @@ -2,7 +2,7 @@ import ko from 'ko'; import { AbstractModel } from 'Knoin/AbstractModel'; -class IdentityModel extends AbstractModel { +export class IdentityModel extends AbstractModel { /** * @param {string} id * @param {string} email @@ -37,5 +37,3 @@ class IdentityModel extends AbstractModel { return name ? name + ' (' + email + ')' : email; } } - -export { IdentityModel, IdentityModel as default }; diff --git a/dev/Model/Message.js b/dev/Model/Message.js index bde218f19..1807e8d2e 100644 --- a/dev/Model/Message.js +++ b/dev/Model/Message.js @@ -25,7 +25,7 @@ const isArray = Array.isArray, }); }; -class MessageModel extends AbstractModel { +export class MessageModel extends AbstractModel { constructor() { super(); @@ -570,5 +570,3 @@ class MessageModel extends AbstractModel { ].join(','); } } - -export { MessageModel, MessageModel as default }; diff --git a/dev/Model/OpenPgpKey.js b/dev/Model/OpenPgpKey.js index ac9db2b94..ff30d091c 100644 --- a/dev/Model/OpenPgpKey.js +++ b/dev/Model/OpenPgpKey.js @@ -4,7 +4,7 @@ import { AbstractModel } from 'Knoin/AbstractModel'; import PgpStore from 'Stores/User/Pgp'; -class OpenPgpKeyModel extends AbstractModel { +export class OpenPgpKeyModel extends AbstractModel { /** * @param {string} index * @param {string} guID @@ -72,5 +72,3 @@ class OpenPgpKeyModel extends AbstractModel { this.select(email, 'emails'); } } - -export { OpenPgpKeyModel, OpenPgpKeyModel as default }; diff --git a/dev/Model/SieveScript.js b/dev/Model/SieveScript.js index 6022470bd..604f438fb 100644 --- a/dev/Model/SieveScript.js +++ b/dev/Model/SieveScript.js @@ -256,7 +256,7 @@ function sieveScriptToFilters(script) return filters; } -class SieveScriptModel extends AbstractModel +export class SieveScriptModel extends AbstractModel { constructor() { super(); @@ -341,5 +341,3 @@ class SieveScriptModel extends AbstractModel } } - -export { SieveScriptModel, SieveScriptModel as default }; diff --git a/dev/Model/Template.js b/dev/Model/Template.js index e880336d8..942749fdb 100644 --- a/dev/Model/Template.js +++ b/dev/Model/Template.js @@ -2,7 +2,7 @@ import ko from 'ko'; import { AbstractModel } from 'Knoin/AbstractModel'; -class TemplateModel extends AbstractModel { +export class TemplateModel extends AbstractModel { /** * @param {string} id * @param {string} name @@ -21,5 +21,3 @@ class TemplateModel extends AbstractModel { // static reviveFromJson(json) {} } - -export { TemplateModel, TemplateModel as default }; diff --git a/dev/Screen/AbstractSettings.js b/dev/Screen/AbstractSettings.js index e2c394b5c..2a2e244a5 100644 --- a/dev/Screen/AbstractSettings.js +++ b/dev/Screen/AbstractSettings.js @@ -6,7 +6,7 @@ import { settings } from 'Common/Links'; import { AbstractScreen } from 'Knoin/AbstractScreen'; -class AbstractSettingsScreen extends AbstractScreen { +export class AbstractSettingsScreen extends AbstractScreen { /** * @param {Array} viewModels */ @@ -181,5 +181,3 @@ class AbstractSettingsScreen extends AbstractScreen { ]; } } - -export { AbstractSettingsScreen, AbstractSettingsScreen as default }; diff --git a/dev/Screen/Admin/Login.js b/dev/Screen/Admin/Login.js index 267b17b0f..12ebb1838 100644 --- a/dev/Screen/Admin/Login.js +++ b/dev/Screen/Admin/Login.js @@ -2,7 +2,7 @@ import { AbstractScreen } from 'Knoin/AbstractScreen'; import { LoginAdminView } from 'View/Admin/Login'; -class LoginAdminScreen extends AbstractScreen { +export class LoginAdminScreen extends AbstractScreen { constructor() { super('login', [LoginAdminView]); } @@ -11,5 +11,3 @@ class LoginAdminScreen extends AbstractScreen { rl.setWindowTitle(); } } - -export { LoginAdminScreen, LoginAdminScreen as default }; diff --git a/dev/Screen/Admin/Settings.js b/dev/Screen/Admin/Settings.js index eaacf8b01..4b5371ea8 100644 --- a/dev/Screen/Admin/Settings.js +++ b/dev/Screen/Admin/Settings.js @@ -11,11 +11,12 @@ import { SecurityAdminSettings } from 'Settings/Admin/Security'; import { PluginsAdminSettings } from 'Settings/Admin/Plugins'; import { PackagesAdminSettings } from 'Settings/Admin/Packages'; import { AboutAdminSettings } from 'Settings/Admin/About'; +import { BrandingAdminSettings } from 'Settings/Admin/Branding'; import { MenuSettingsAdminView } from 'View/Admin/Settings/Menu'; import { PaneSettingsAdminView } from 'View/Admin/Settings/Pane'; -class SettingsAdminScreen extends AbstractSettingsScreen { +export class SettingsAdminScreen extends AbstractSettingsScreen { constructor() { super([MenuSettingsAdminView, PaneSettingsAdminView]); } @@ -24,8 +25,6 @@ class SettingsAdminScreen extends AbstractSettingsScreen { * @param {Function=} fCallback = null */ setupSettings(fCallback = null) { - let branding = require('Settings/Admin/Branding').default; - addSettingsViewModel( GeneralAdminSettings, 'AdminSettingsGeneral', @@ -34,21 +33,23 @@ class SettingsAdminScreen extends AbstractSettingsScreen { true ); - addSettingsViewModel(DomainsAdminSettings, 'AdminSettingsDomains', 'TABS_LABELS/LABEL_DOMAINS_NAME', 'domains'); - - addSettingsViewModel(LoginAdminSettings, 'AdminSettingsLogin', 'TABS_LABELS/LABEL_LOGIN_NAME', 'login'); - - addSettingsViewModel(branding, 'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding'); - - addSettingsViewModel(ContactsAdminSettings, 'AdminSettingsContacts', 'TABS_LABELS/LABEL_CONTACTS_NAME', 'contacts'); - - addSettingsViewModel(SecurityAdminSettings, 'AdminSettingsSecurity', 'TABS_LABELS/LABEL_SECURITY_NAME', 'security'); - - addSettingsViewModel(PluginsAdminSettings, 'AdminSettingsPlugins', 'TABS_LABELS/LABEL_PLUGINS_NAME', 'plugins'); - - addSettingsViewModel(PackagesAdminSettings, 'AdminSettingsPackages', 'TABS_LABELS/LABEL_PACKAGES_NAME', 'packages'); - - addSettingsViewModel(AboutAdminSettings, 'AdminSettingsAbout', 'TABS_LABELS/LABEL_ABOUT_NAME', 'about'); + [ + [DomainsAdminSettings, 'Domains'], + [LoginAdminSettings, 'Login'], + [BrandingAdminSettings, 'Branding'], + [ContactsAdminSettings, 'Contacts'], + [SecurityAdminSettings, 'Security'], + [PluginsAdminSettings, 'Plugins'], + [PackagesAdminSettings, 'Packages'], + [AboutAdminSettings, 'About'], + ].forEach(item => + addSettingsViewModel( + item[0], + 'AdminSettings'+item[1], + 'TABS_LABELS/LABEL_'+item[1].toUpperCase()+'_NAME', + item[1].toLowerCase() + ) + ); runSettingsViewModelHooks(true); @@ -61,5 +62,3 @@ class SettingsAdminScreen extends AbstractSettingsScreen { rl.setWindowTitle(); } } - -export { SettingsAdminScreen, SettingsAdminScreen as default }; diff --git a/dev/Screen/User/Login.js b/dev/Screen/User/Login.js index 0f5165e7d..c6282f67e 100644 --- a/dev/Screen/User/Login.js +++ b/dev/Screen/User/Login.js @@ -2,7 +2,7 @@ import { AbstractScreen } from 'Knoin/AbstractScreen'; import { LoginUserView } from 'View/User/Login'; -class LoginUserScreen extends AbstractScreen { +export class LoginUserScreen extends AbstractScreen { constructor() { super('login', [LoginUserView]); } @@ -11,5 +11,3 @@ class LoginUserScreen extends AbstractScreen { rl.setWindowTitle(); } } - -export { LoginUserScreen, LoginUserScreen as default }; diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js index aee96bb48..826527008 100644 --- a/dev/Screen/User/MailBox.js +++ b/dev/Screen/User/MailBox.js @@ -21,7 +21,7 @@ import { AbstractScreen } from 'Knoin/AbstractScreen'; const Settings = rl.settings; -class MailBoxUserScreen extends AbstractScreen { +export class MailBoxUserScreen extends AbstractScreen { constructor() { super('mailbox', [ SystemDropDownMailBoxUserView, @@ -168,5 +168,3 @@ class MailBoxUserScreen extends AbstractScreen { ]; } } - -export { MailBoxUserScreen, MailBoxUserScreen as default }; diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js index ba8480fb5..c5c23c1c9 100644 --- a/dev/Screen/User/Settings.js +++ b/dev/Screen/User/Settings.js @@ -26,7 +26,7 @@ import { PaneSettingsUserView } from 'View/User/Settings/Pane'; const Settings = rl.settings; -class SettingsUserScreen extends AbstractSettingsScreen { +export class SettingsUserScreen extends AbstractSettingsScreen { constructor() { super([SystemDropDownSettingsUserView, MenuSettingsUserView, PaneSettingsUserView]); @@ -118,5 +118,3 @@ class SettingsUserScreen extends AbstractSettingsScreen { rl.setWindowTitle((sEmail ? sEmail + ' - ' : '') + this.sSettingsTitle); } } - -export { SettingsUserScreen, SettingsUserScreen as default }; diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js index 4e678ac6a..88b8f9e64 100644 --- a/dev/Settings/Admin/About.js +++ b/dev/Settings/Admin/About.js @@ -1,9 +1,7 @@ import ko from 'ko'; -class AboutAdminSettings { +export class AboutAdminSettings { constructor() { this.version = ko.observable(rl.settings.app('version')); } } - -export { AboutAdminSettings, AboutAdminSettings as default }; diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js index 5a3fd2796..a9856aa6e 100644 --- a/dev/Settings/Admin/Branding.js +++ b/dev/Settings/Admin/Branding.js @@ -4,7 +4,7 @@ import { settingsSaveHelperSimpleFunction } from 'Common/Utils'; import Remote from 'Remote/Admin/Fetch'; -class BrandingAdminSettings { +export class BrandingAdminSettings { constructor() { const settingsGet = rl.settings.get; this.title = ko.observable(settingsGet('Title')).idleTrigger(); @@ -38,5 +38,3 @@ class BrandingAdminSettings { }, 50); } } - -export { BrandingAdminSettings, BrandingAdminSettings as default }; diff --git a/dev/Settings/Admin/Contacts.js b/dev/Settings/Admin/Contacts.js index de5f3adca..eabd8a688 100644 --- a/dev/Settings/Admin/Contacts.js +++ b/dev/Settings/Admin/Contacts.js @@ -8,7 +8,7 @@ import { command } from 'Knoin/Knoin'; const settingsGet = rl.settings.get; -class ContactsAdminSettings { +export class ContactsAdminSettings { constructor() { this.defaultOptionsAfterRender = defaultOptionsAfterRender; @@ -163,5 +163,3 @@ class ContactsAdminSettings { }, 50); } } - -export { ContactsAdminSettings, ContactsAdminSettings as default }; diff --git a/dev/Settings/Admin/Domains.js b/dev/Settings/Admin/Domains.js index edf1928e4..e0df0ac41 100644 --- a/dev/Settings/Admin/Domains.js +++ b/dev/Settings/Admin/Domains.js @@ -6,7 +6,7 @@ import { showScreenPopup } from 'Knoin/Knoin'; import DomainStore from 'Stores/Admin/Domain'; import Remote from 'Remote/Admin/Fetch'; -class DomainsAdminSettings { +export class DomainsAdminSettings { constructor() { this.domains = DomainStore.domains; @@ -55,5 +55,3 @@ class DomainsAdminSettings { rl.app.reloadDomainList(); } } - -export { DomainsAdminSettings, DomainsAdminSettings as default }; diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js index afe06c067..9a308014f 100644 --- a/dev/Settings/Admin/General.js +++ b/dev/Settings/Admin/General.js @@ -22,7 +22,7 @@ import CapaAdminStore from 'Stores/Admin/Capa'; const settingsGet = rl.settings.get; -class GeneralAdminSettings { +export class GeneralAdminSettings { constructor() { this.language = LanguageStore.language; this.languages = LanguageStore.languages; @@ -178,5 +178,3 @@ class GeneralAdminSettings { ]); } } - -export { GeneralAdminSettings, GeneralAdminSettings as default }; diff --git a/dev/Settings/Admin/Login.js b/dev/Settings/Admin/Login.js index b3f6025e6..28959739e 100644 --- a/dev/Settings/Admin/Login.js +++ b/dev/Settings/Admin/Login.js @@ -4,7 +4,7 @@ import { settingsSaveHelperSimpleFunction } from 'Common/Utils'; import Remote from 'Remote/Admin/Fetch'; -class LoginAdminSettings { +export class LoginAdminSettings { constructor() { const settingsGet = rl.settings.get; ko.addObservablesTo(this, { @@ -53,5 +53,3 @@ class LoginAdminSettings { }, 50); } } - -export { LoginAdminSettings, LoginAdminSettings as default }; diff --git a/dev/Settings/Admin/Packages.js b/dev/Settings/Admin/Packages.js index d4197e197..31a264069 100644 --- a/dev/Settings/Admin/Packages.js +++ b/dev/Settings/Admin/Packages.js @@ -6,7 +6,7 @@ import { getNotification } from 'Common/Translator'; import PackageStore from 'Stores/Admin/Package'; import Remote from 'Remote/Admin/Fetch'; -class PackagesAdminSettings { +export class PackagesAdminSettings { constructor() { this.packagesError = ko.observable(''); @@ -76,5 +76,3 @@ class PackagesAdminSettings { } } } - -export { PackagesAdminSettings, PackagesAdminSettings as default }; diff --git a/dev/Settings/Admin/Plugins.js b/dev/Settings/Admin/Plugins.js index 79d5fbffb..23970c1d0 100644 --- a/dev/Settings/Admin/Plugins.js +++ b/dev/Settings/Admin/Plugins.js @@ -9,7 +9,7 @@ import PluginStore from 'Stores/Admin/Plugin'; import Remote from 'Remote/Admin/Fetch'; -class PluginsAdminSettings { +export class PluginsAdminSettings { constructor() { this.enabledPlugins = ko.observable(!!rl.settings.get('EnabledPlugins')); @@ -72,5 +72,3 @@ class PluginsAdminSettings { rl.app.reloadPluginList(); } } - -export { PluginsAdminSettings, PluginsAdminSettings as default }; diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js index 17e1e582c..8abcb48c7 100644 --- a/dev/Settings/Admin/Security.js +++ b/dev/Settings/Admin/Security.js @@ -11,7 +11,7 @@ import { command } from 'Knoin/Knoin'; const settingsGet = rl.settings.get; -class SecurityAdminSettings { +export class SecurityAdminSettings { constructor() { this.weakPassword = AppAdminStore.weakPassword; @@ -172,5 +172,3 @@ class SecurityAdminSettings { this.twoFactorDropperUserFocused(false); } } - -export { SecurityAdminSettings, SecurityAdminSettings as default }; diff --git a/dev/Settings/User/Accounts.js b/dev/Settings/User/Accounts.js index c84148b8b..648cedbac 100644 --- a/dev/Settings/User/Accounts.js +++ b/dev/Settings/User/Accounts.js @@ -8,7 +8,7 @@ import Remote from 'Remote/User/Fetch'; import { showScreenPopup } from 'Knoin/Knoin'; -class AccountsUserSettings { +export class AccountsUserSettings { constructor() { this.allowAdditionalAccount = rl.settings.capa(Capa.AdditionalAccounts); this.allowIdentities = rl.settings.capa(Capa.Identities); @@ -89,5 +89,3 @@ class AccountsUserSettings { }); } } - -export { AccountsUserSettings, AccountsUserSettings as default }; diff --git a/dev/Settings/User/Contacts.js b/dev/Settings/User/Contacts.js index 61d09386e..bdc3e1342 100644 --- a/dev/Settings/User/Contacts.js +++ b/dev/Settings/User/Contacts.js @@ -4,7 +4,7 @@ import AppStore from 'Stores/User/App'; import ContactStore from 'Stores/User/Contact'; import Remote from 'Remote/User/Fetch'; -class ContactsUserSettings { +export class ContactsUserSettings { constructor() { this.contactsAutosave = AppStore.contactsAutosave; @@ -44,5 +44,3 @@ class ContactsUserSettings { }); } } - -export { ContactsUserSettings, ContactsUserSettings as default }; diff --git a/dev/Settings/User/Filters.js b/dev/Settings/User/Filters.js index f77e0fbe9..31d94b53b 100644 --- a/dev/Settings/User/Filters.js +++ b/dev/Settings/User/Filters.js @@ -11,7 +11,7 @@ import { SieveScriptModel } from 'Model/SieveScript'; import { showScreenPopup } from 'Knoin/Knoin'; -class FiltersUserSettings { +export class FiltersUserSettings { constructor() { this.scripts = SieveStore.scripts; this.loading = ko.observable(false).extend({ throttle: 200 }); @@ -115,5 +115,3 @@ class FiltersUserSettings { this.updateList(); } } - -export { FiltersUserSettings, FiltersUserSettings as default }; diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js index 1ac80c307..3766da8e7 100644 --- a/dev/Settings/User/Folders.js +++ b/dev/Settings/User/Folders.js @@ -13,7 +13,7 @@ import Remote from 'Remote/User/Fetch'; import { showScreenPopup } from 'Knoin/Knoin'; -class FoldersUserSettings { +export class FoldersUserSettings { constructor() { this.displaySpecSetting = FolderStore.displaySpecSetting; this.folderList = FolderStore.folderList; @@ -141,5 +141,3 @@ class FoldersUserSettings { folder.checkable(false); } } - -export { FoldersUserSettings, FoldersUserSettings as default }; diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js index 28830a504..cfcb1fff0 100644 --- a/dev/Settings/User/General.js +++ b/dev/Settings/User/General.js @@ -19,7 +19,7 @@ import MessageStore from 'Stores/User/Message'; import Remote from 'Remote/User/Fetch'; -class GeneralUserSettings { +export class GeneralUserSettings { constructor() { this.language = LanguageStore.language; this.languages = LanguageStore.languages; @@ -163,5 +163,3 @@ class GeneralUserSettings { showScreenPopup(require('View/Popup/Languages'), [this.language, this.languages(), LanguageStore.userLanguage()]); } } - -export { GeneralUserSettings, GeneralUserSettings as default }; diff --git a/dev/Settings/User/OpenPgp.js b/dev/Settings/User/OpenPgp.js index 64dd77d72..0c1a0f621 100644 --- a/dev/Settings/User/OpenPgp.js +++ b/dev/Settings/User/OpenPgp.js @@ -9,7 +9,7 @@ import Remote from 'Remote/User/Fetch'; import { showScreenPopup } from 'Knoin/Knoin'; -class OpenPgpUserSettings { +export class OpenPgpUserSettings { constructor() { this.openpgpkeys = PgpStore.openpgpkeys; this.openpgpkeysPublic = PgpStore.openpgpkeysPublic; @@ -64,5 +64,3 @@ class OpenPgpUserSettings { }, 50); } } - -export { OpenPgpUserSettings, OpenPgpUserSettings as default }; diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js index 54de11930..567b8356b 100644 --- a/dev/Settings/User/Security.js +++ b/dev/Settings/User/Security.js @@ -10,7 +10,7 @@ import SettinsStore from 'Stores/User/Settings'; import Remote from 'Remote/User/Fetch'; -class SecurityUserSettings { +export class SecurityUserSettings { constructor() { this.capaAutoLogout = rl.settings.capa(Capa.AutoLogout); this.capaTwoFactor = rl.settings.capa(Capa.TwoFactor); @@ -47,5 +47,3 @@ class SecurityUserSettings { } } } - -export { SecurityUserSettings, SecurityUserSettings as default }; diff --git a/dev/Settings/User/Templates.js b/dev/Settings/User/Templates.js index a282ba8ee..2b3ebde49 100644 --- a/dev/Settings/User/Templates.js +++ b/dev/Settings/User/Templates.js @@ -7,7 +7,7 @@ import Remote from 'Remote/User/Fetch'; import { showScreenPopup } from 'Knoin/Knoin'; -class TemplatesUserSettings { +export class TemplatesUserSettings { constructor() { this.templates = TemplateStore.templates; @@ -56,5 +56,3 @@ class TemplatesUserSettings { this.reloadTemplates(); } } - -export { TemplatesUserSettings, TemplatesUserSettings as default }; diff --git a/dev/Settings/User/Themes.js b/dev/Settings/User/Themes.js index fb86d4a37..552d7fe20 100644 --- a/dev/Settings/User/Themes.js +++ b/dev/Settings/User/Themes.js @@ -9,7 +9,7 @@ import ThemeStore from 'Stores/Theme'; import Remote from 'Remote/User/Fetch'; -class ThemesUserSettings { +export class ThemesUserSettings { constructor() { this.theme = ThemeStore.theme; this.themes = ThemeStore.themes; @@ -130,5 +130,3 @@ class ThemesUserSettings { } } } - -export { ThemesUserSettings, ThemesUserSettings as default }; diff --git a/dev/View/Admin/Login.js b/dev/View/Admin/Login.js index 78cf527b3..5350f9773 100644 --- a/dev/View/Admin/Login.js +++ b/dev/View/Admin/Login.js @@ -96,4 +96,4 @@ class LoginAdminView extends AbstractViewNext { } } -export { LoginAdminView, LoginAdminView as default }; +export { LoginAdminView }; diff --git a/dev/View/Admin/Settings/Menu.js b/dev/View/Admin/Settings/Menu.js index 5eb1c838f..8a2c87683 100644 --- a/dev/View/Admin/Settings/Menu.js +++ b/dev/View/Admin/Settings/Menu.js @@ -31,4 +31,4 @@ class MenuSettingsAdminView extends AbstractViewNext { } } -export { MenuSettingsAdminView, MenuSettingsAdminView as default }; +export { MenuSettingsAdminView }; diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js index 295511ffe..66b4243a1 100644 --- a/dev/View/Admin/Settings/Pane.js +++ b/dev/View/Admin/Settings/Pane.js @@ -40,4 +40,4 @@ class PaneSettingsAdminView extends AbstractViewNext { } } -export { PaneSettingsAdminView, PaneSettingsAdminView as default }; +export { PaneSettingsAdminView }; diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js index 960c4a967..39b5d5f3d 100644 --- a/dev/View/User/AbstractSystemDropDown.js +++ b/dev/View/User/AbstractSystemDropDown.js @@ -10,7 +10,7 @@ import { AbstractViewNext } from 'Knoin/AbstractViewNext'; const Settings = rl.settings; -class AbstractSystemDropDownUserView extends AbstractViewNext { +export class AbstractSystemDropDownUserView extends AbstractViewNext { constructor() { super(); @@ -96,5 +96,3 @@ class AbstractSystemDropDownUserView extends AbstractViewNext { }); } } - -export { AbstractSystemDropDownUserView, AbstractSystemDropDownUserView as default }; diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index 17283cf4d..cacb0e5a8 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -266,4 +266,4 @@ class LoginUserView extends AbstractViewNext { } } -export { LoginUserView, LoginUserView as default }; +export { LoginUserView }; diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index 2d9c06726..839a8382a 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -223,4 +223,4 @@ class FolderListMailBoxUserView extends AbstractViewNext { } } -export { FolderListMailBoxUserView, FolderListMailBoxUserView as default }; +export { FolderListMailBoxUserView }; diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 79145e364..da4cb687c 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -938,4 +938,4 @@ class MessageListMailBoxUserView extends AbstractViewNext { } } -export { MessageListMailBoxUserView, MessageListMailBoxUserView as default }; +export { MessageListMailBoxUserView }; diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index b4db76270..cd99be6e1 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -775,4 +775,4 @@ class MessageViewMailBoxUserView extends AbstractViewNext { } } -export { MessageViewMailBoxUserView, MessageViewMailBoxUserView as default }; +export { MessageViewMailBoxUserView }; diff --git a/dev/View/User/MailBox/SystemDropDown.js b/dev/View/User/MailBox/SystemDropDown.js index 809f135cf..a40b0514b 100644 --- a/dev/View/User/MailBox/SystemDropDown.js +++ b/dev/View/User/MailBox/SystemDropDown.js @@ -8,4 +8,4 @@ import { AbstractSystemDropDownUserView } from 'View/User/AbstractSystemDropDown }) class SystemDropDownMailBoxUserView extends AbstractSystemDropDownUserView {} -export { SystemDropDownMailBoxUserView, SystemDropDownMailBoxUserView as default }; +export { SystemDropDownMailBoxUserView }; diff --git a/dev/View/User/Settings/Menu.js b/dev/View/User/Settings/Menu.js index 299b65186..b04ca71bf 100644 --- a/dev/View/User/Settings/Menu.js +++ b/dev/View/User/Settings/Menu.js @@ -45,4 +45,4 @@ class MenuSettingsUserView extends AbstractViewNext { } } -export { MenuSettingsUserView, MenuSettingsUserView as default }; +export { MenuSettingsUserView }; diff --git a/dev/View/User/Settings/Pane.js b/dev/View/User/Settings/Pane.js index 923feeee1..b275b9caa 100644 --- a/dev/View/User/Settings/Pane.js +++ b/dev/View/User/Settings/Pane.js @@ -48,4 +48,4 @@ class PaneSettingsUserView extends AbstractViewNext { } } -export { PaneSettingsUserView, PaneSettingsUserView as default }; +export { PaneSettingsUserView }; diff --git a/dev/View/User/Settings/SystemDropDown.js b/dev/View/User/Settings/SystemDropDown.js index 3fdedcfd9..b6a1d50f3 100644 --- a/dev/View/User/Settings/SystemDropDown.js +++ b/dev/View/User/Settings/SystemDropDown.js @@ -8,4 +8,4 @@ import { AbstractSystemDropDownUserView } from 'View/User/AbstractSystemDropDown }) class SystemDropDownSettingsUserView extends AbstractSystemDropDownUserView {} -export { SystemDropDownSettingsUserView, SystemDropDownSettingsUserView as default }; +export { SystemDropDownSettingsUserView };