Compare commits

...

2 Commits

7 changed files with 92 additions and 26 deletions

View File

@ -183,7 +183,8 @@ interface SettingsInterface {
offsetX: number, // fed to translateX(offsetX + '%'). Valid range [-100, 0] offsetX: number, // fed to translateX(offsetX + '%'). Valid range [-100, 0]
offsetY: number // fed to translateY(offsetY + '%'). Valid range [-100, 100] offsetY: number // fed to translateY(offsetY + '%'). Valid range [-100, 100]
}, },
} },
devMode?: boolean,
} }
restrictions?: RestrictionsSettings; restrictions?: RestrictionsSettings;

View File

@ -30,6 +30,9 @@
<div <div
v-for="tab of tabs" v-for="tab of tabs"
:key="tab.id" :key="tab.id"
>
<div
v-if="!tab.hidden"
class="tab" class="tab"
:class="{ :class="{
'active': tab.id === selectedTab, 'active': tab.id === selectedTab,
@ -49,6 +52,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="content flex flex-col"> <div class="content flex flex-col">
<!-- autodetection warning --> <!-- autodetection warning -->
@ -171,7 +175,7 @@ export default {
// {id: 'advancedOptions', label: 'Advanced options', icon: 'cogs' }, // {id: 'advancedOptions', label: 'Advanced options', icon: 'cogs' },
{id: 'changelog', label: 'What\'s new', icon: 'alert-decagram' }, {id: 'changelog', label: 'What\'s new', icon: 'alert-decagram' },
{id: 'about', label: 'About', icon: 'information-outline'}, {id: 'about', label: 'About', icon: 'information-outline'},
{id: 'debugging', label: 'Debugging', icon: 'bug-outline' }, {id: 'debugging', label: 'Debugging', icon: 'bug-outline', hidden: true},
], ],
selectedTab: 'extensionSettings', selectedTab: 'extensionSettings',
BrowserDetect: BrowserDetect, BrowserDetect: BrowserDetect,
@ -196,6 +200,8 @@ export default {
} }
}, },
created() { created() {
this.settings.listenAfterChange(this.setDebugTabVisibility);
if (this.defaultTab) { if (this.defaultTab) {
this.selectedTab = this.defaultTab; this.selectedTab = this.defaultTab;
} }
@ -213,8 +219,10 @@ export default {
}, },
} }
) )
this.setDebugTabVisibility();
}, },
destroyed() { destroyed() {
this.settings.removeListenerAfterChange(this.setDebugTabVisibility);
this.eventBus.unsubscribeAll(this); this.eventBus.unsubscribeAll(this);
}, },
methods: { methods: {
@ -230,6 +238,12 @@ export default {
setPreventClose(bool) { setPreventClose(bool) {
this.preventClose = bool; this.preventClose = bool;
this.$emit('preventClose', bool); this.$emit('preventClose', bool);
},
setDebugTabVisibility() {
const debugTab = this.tabs.find( x => x.id === 'debugging');
if (debugTab) {
debugTab.hidden = !this.settings.active.ui.devMode;
}
} }
} }
} }

View File

@ -90,11 +90,15 @@
<div v-if="enableSettingsEditor" class="field"> <div v-if="enableSettingsEditor" class="field">
<div class="label">Show developer options</div> <div class="label">Show developer options</div>
<input v-model="showSettingsEditor" type="checkbox"> <input
type="checkbox"
v-model="settings.active.ui.devMode"
@change="settings.saveWithoutReload"
>
</div> </div>
</div> </div>
</div> </div>
<div v-if="enableSettingsEditor && showSettingsEditor" class="h-full grow"> <div v-if="enableSettingsEditor && settings.active.ui.devMode" class="h-full grow">
<h2>Settings editor</h2> <h2>Settings editor</h2>
<div class="flex flex-row w-full"> <div class="flex flex-row w-full">
<div class="flex flex-row"> <div class="flex flex-row">
@ -144,7 +148,6 @@ export default {
return { return {
tab: 'siteSettings', tab: 'siteSettings',
importSettingDialogConfig: {visible: false}, importSettingDialogConfig: {visible: false},
showSettingsEditor: false,
allowSettingsEditing: false, allowSettingsEditing: false,
editorSaveFinished: false, editorSaveFinished: false,
settingsJson: {}, settingsJson: {},
@ -206,7 +209,6 @@ export default {
}, },
handleImportedSettings(newSettings) { handleImportedSettings(newSettings) {
console.log('new settings received:', newSettings)
this.importSettingDialogConfig = { this.importSettingDialogConfig = {
visible: true, visible: true,
confirm: () => { confirm: () => {
@ -235,14 +237,12 @@ export default {
}, },
saveSettingsChanges() { saveSettingsChanges() {
console.log(' saving settings changes ...', this.allowSettingsEditing)
if (this.allowSettingsEditing) { if (this.allowSettingsEditing) {
this.settings.active = this.settingsJson; this.settings.active = this.settingsJson;
this.settings.saveWithoutReload(); this.settings.saveWithoutReload();
this.resetSettingsEditor(); this.resetSettingsEditor();
this.editorSaveFinished = true; this.editorSaveFinished = true;
console.log('save finished ...')
setTimeout(() => { setTimeout(() => {
this.editorSaveFinished = false; this.editorSaveFinished = false;
}, 3000); }, 3000);

View File

@ -37,8 +37,8 @@ class Settings {
onSettingsChanged: any; onSettingsChanged: any;
afterSettingsSaved: any; afterSettingsSaved: any;
onChangedCallbacks: any[] = []; onChangedCallbacks: (() => void)[] = [];
afterSettingsChangedCallbacks: any[] = []; afterSettingsChangedCallbacks: (() => void)[] = [];
//#endregion //#endregion
constructor(options) { constructor(options) {
@ -398,9 +398,15 @@ class Settings {
listenOnChange(fn: () => void): void { listenOnChange(fn: () => void): void {
this.onChangedCallbacks.push(fn); this.onChangedCallbacks.push(fn);
} }
removeOnChangeListener(fn: () => void): void {
this.onChangedCallbacks = this.afterSettingsChangedCallbacks.filter(x => x !== fn);
}
listenAfterChange(fn: () => void): void { listenAfterChange(fn: () => void): void {
this.afterSettingsChangedCallbacks.push(fn); this.afterSettingsChangedCallbacks.push(fn);
} }
removeAfterChangeListener(fn: () => void): void {
this.afterSettingsChangedCallbacks = this.afterSettingsChangedCallbacks.filter(x => x !== fn);
}
} }
export default Settings; export default Settings;

View File

@ -0,0 +1,14 @@
import { log } from 'console';
export class LogAggregator {
history: any[];
log(message: any, originData: any) {
}
}

View File

@ -0,0 +1,21 @@
export default interface LogConfig {
outputs: {
console: boolean,
buffer: boolean,
},
components: {
settings?: boolean,
aard?: boolean,
videoData?: boolean,
resizer?: boolean,
comms?: boolean,
},
environments: {
page: boolean,
popup: boolean,
ui: boolean,
uwServer: boolean,
}
}

View File

@ -0,0 +1,10 @@
export interface LogMessageOrigin {
component: string,
environment: string,
}
export interface LogMessage {
time: Date;
message: any,
origin: LogMessageOrigin
}