This version uses Rollup instead of WebPack.

Due to that the code is smaller and has changes to prevent Circular Dependencies
This commit is contained in:
djmaze 2021-01-25 22:00:13 +01:00
parent 5e63ade9dd
commit ad8fd8879b
49 changed files with 595 additions and 577 deletions

View file

@ -6,6 +6,9 @@ import { showScreenPopup } from 'Knoin/Knoin';
import DomainStore from 'Stores/Admin/Domain';
import Remote from 'Remote/Admin/Fetch';
import { DomainPopupView } from 'View/Popup/Domain';
import { DomainAliasPopupView } from 'View/Popup/DomainAlias';
export class DomainsAdminSettings {
constructor() {
this.domains = DomainStore.domains;
@ -19,11 +22,11 @@ export class DomainsAdminSettings {
}
createDomain() {
showScreenPopup(require('View/Popup/Domain'));
showScreenPopup(DomainPopupView);
}
createDomainAlias() {
showScreenPopup(require('View/Popup/DomainAlias'));
showScreenPopup(DomainAliasPopupView);
}
deleteDomain(domain) {
@ -47,7 +50,7 @@ export class DomainsAdminSettings {
onDomainLoadRequest(sResult, oData) {
if (StorageResultType.Success === sResult && oData && oData.Result) {
showScreenPopup(require('View/Popup/Domain'), [oData.Result]);
showScreenPopup(DomainPopupView, [oData.Result]);
}
}

View file

@ -4,12 +4,11 @@ import {
pInt,
settingsSaveHelperSimpleFunction,
changeTheme,
convertThemeName,
convertLangName
convertThemeName
} from 'Common/Utils';
import { SaveSettingsStep } from 'Common/Enums';
import { reload as translatorReload } from 'Common/Translator';
import { reload as translatorReload, convertLangName } from 'Common/Translator';
import { showScreenPopup } from 'Knoin/Knoin';
@ -19,6 +18,7 @@ import ThemeStore from 'Stores/Theme';
import LanguageStore from 'Stores/Language';
import AppAdminStore from 'Stores/Admin/App';
import CapaAdminStore from 'Stores/Admin/Capa';
import LanguagesPopupView from 'View/Popup/Languages';
const settingsGet = rl.settings.get;
@ -167,11 +167,11 @@ export class GeneralAdminSettings {
}
selectLanguage() {
showScreenPopup(require('View/Popup/Languages'), [this.language, this.languages(), LanguageStore.userLanguage()]);
showScreenPopup(LanguagesPopupView, [this.language, this.languages(), LanguageStore.userLanguage()]);
}
selectLanguageAdmin() {
showScreenPopup(require('View/Popup/Languages'), [
showScreenPopup(LanguagesPopupView, [
this.languageAdmin,
this.languagesAdmin(),
LanguageStore.userLanguageAdmin()

View file

@ -9,6 +9,8 @@ import PluginStore from 'Stores/Admin/Plugin';
import Remote from 'Remote/Admin/Fetch';
import { PluginPopupView } from 'View/Popup/Plugin';
export class PluginsAdminSettings {
constructor() {
this.enabledPlugins = ko.observable(!!rl.settings.get('EnabledPlugins'));
@ -54,7 +56,7 @@ export class PluginsAdminSettings {
onPluginLoadRequest(result, data) {
if (StorageResultType.Success === result && data && data.Result) {
showScreenPopup(require('View/Popup/Plugin'), [data.Result]);
showScreenPopup(PluginPopupView, [data.Result]);
}
}