aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/App.vue10
-rw-r--r--src/components/SearchModal.vue4
-rw-r--r--src/components/SettingsModal.vue15
-rw-r--r--src/components/TileInfoModal.vue2
-rw-r--r--src/lib.ts4
5 files changed, 21 insertions, 14 deletions
diff --git a/src/App.vue b/src/App.vue
index f54cb31..13da971 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -326,7 +326,7 @@ export default defineComponent({
let tolNode = this.tolMap.get(layoutNode.name)!;
if (!this.tolMap.has(tolNode.children[0])){
let urlParams = 'type=node&name=' + encodeURIComponent(layoutNode.name);
- urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : '';
+ urlParams += '&tree=' + this.uiOpts.tree;
let responseObj: {[x: string]: TolNode} = await getServerResponse(urlParams);
if (responseObj == null){
return false;
@@ -421,7 +421,7 @@ export default defineComponent({
let tolNode = this.tolMap.get(layoutNode.name)!;
if (!this.tolMap.has(tolNode.children[0])){
let urlParams = 'type=node&name=' + encodeURIComponent(layoutNode.name);
- urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : '';
+ urlParams += '&tree=' + this.uiOpts.tree;
let responseObj: {[x: string]: TolNode} = await getServerResponse(urlParams);
if (responseObj == null){
return false;
@@ -490,7 +490,7 @@ export default defineComponent({
}
// Query server for tol-node info
let urlParams = 'type=info&name=' + encodeURIComponent(nodeName);
- urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : '';
+ urlParams += '&tree=' + this.uiOpts.tree;
let responseObj: InfoResponse = await getServerResponse(urlParams);
if (responseObj == null){
return;
@@ -819,7 +819,7 @@ export default defineComponent({
//Note: Using JSON.stringify here to roughly deep-compare values
if (item == null && JSON.stringify(this.uiOpts[prop]) != JSON.stringify(uiOpts[prop])){
this.uiOpts[prop] = uiOpts[prop];
- if (prop == 'useReducedTree'){
+ if (prop == 'tree'){
changedTree = true;
}
}
@@ -875,7 +875,7 @@ export default defineComponent({
async initTreeFromServer(){
// Query server
let urlParams = 'type=node';
- urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : '';
+ urlParams += '&tree=' + this.uiOpts.tree;
let responseObj: {[x: string]: TolNode} = await getServerResponse(urlParams);
if (responseObj == null){
return;
diff --git a/src/components/SearchModal.vue b/src/components/SearchModal.vue
index 2e8b9a2..4d39772 100644
--- a/src/components/SearchModal.vue
+++ b/src/components/SearchModal.vue
@@ -117,7 +117,7 @@ export default defineComponent({
// Get URL params to use for querying search-suggestions
let urlParams = 'type=sugg&name=' + encodeURIComponent(input.value);
urlParams += '&limit=' + this.uiOpts.searchSuggLimit;
- urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : '';
+ urlParams += '&tree=' + this.uiOpts.tree;
// Query server, delaying/skipping if a request was recently sent
this.pendingSuggReqParams = urlParams;
this.pendingSuggInput = input.value;
@@ -186,7 +186,7 @@ export default defineComponent({
}
// Ask server for nodes in parent-chain, updates tolMap, then emits search event
let urlParams = 'type=node&toroot=true&name=' + encodeURIComponent(tolNodeName);
- urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : '';
+ urlParams += '&tree=' + this.uiOpts.tree;
let responseObj: {[x: string]: TolNode} = await getServerResponse(urlParams);
if (responseObj == null){
return;
diff --git a/src/components/SettingsModal.vue b/src/components/SettingsModal.vue
index 16351c4..315ddb4 100644
--- a/src/components/SettingsModal.vue
+++ b/src/components/SettingsModal.vue
@@ -78,8 +78,15 @@
<div class="border rounded p-1">
<h2 class="text-center">Other</h2>
<div>
- <label> <input type="checkbox" v-model="uiOpts.useReducedTree"
- @change="onSettingChg('UI', 'useReducedTree')"/> Use simplified tree </label>
+ <div>Tree to use</div>
+ <ul>
+ <li> <label> <input type="radio" v-model="uiOpts.tree" value="trimmed"
+ @change="onSettingChg('UI', 'tree')"/> Comprehensive </label> </li>
+ <li> <label> <input type="radio" v-model="uiOpts.tree" value="images"
+ @change="onSettingChg('UI', 'tree')"/> Visual </label> </li>
+ <li> <label> <input type="radio" v-model="uiOpts.tree" value="picked"
+ @change="onSettingChg('UI', 'tree')"/> Minimal </label> </li>
+ </ul>
</div>
<div>
<label> <input type="checkbox" v-model="uiOpts.searchJumpMode"
@@ -161,7 +168,7 @@ export default defineComponent({
}
// Notify App
this.$emit('setting-chg', optionType, option,
- {relayout: optionType == 'LYT', reinit: optionType == 'UI' && option == 'useReducedTree'});
+ {relayout: optionType == 'LYT', reinit: optionType == 'UI' && option == 'tree'});
// Possibly make saved-indicator appear/animate
if (!this.saved){
this.saved = true;
@@ -205,7 +212,7 @@ export default defineComponent({
// Restore default options
let defaultLytOpts = getDefaultLytOpts();
let defaultUiOpts = getDefaultUiOpts(defaultLytOpts);
- let needReinit = this.uiOpts.useReducedTree != defaultUiOpts.useReducedTree;
+ let needReinit = this.uiOpts.tree != defaultUiOpts.tree;
Object.assign(this.lytOpts, defaultLytOpts);
Object.assign(this.uiOpts, defaultUiOpts);
// Notify App
diff --git a/src/components/TileInfoModal.vue b/src/components/TileInfoModal.vue
index 129e861..3593600 100644
--- a/src/components/TileInfoModal.vue
+++ b/src/components/TileInfoModal.vue
@@ -70,7 +70,7 @@ import CloseIcon from './icon/CloseIcon.vue';
import ExternalLinkIcon from './icon/ExternalLinkIcon.vue';
import {TolNode, TolMap} from '../tol';
import {LayoutNode, LayoutOptions} from '../layout';
-import {getServerResponse, getImagePath, DescInfo, ImgInfo, NodeInfo, InfoResponse, UiOptions} from '../lib';
+import {getImagePath, DescInfo, ImgInfo, NodeInfo, InfoResponse, UiOptions} from '../lib';
import {capitalizeWords} from '../util';
export default defineComponent({
diff --git a/src/lib.ts b/src/lib.ts
index bbeb02a..2b0aabc 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -106,7 +106,7 @@ export type UiOptions = {
touchDevice: boolean,
breakpoint: Breakpoint,
// Other
- useReducedTree: boolean,
+ tree: 'trimmed' | 'images' | 'picked',
searchSuggLimit: number, // Max number of search suggestions
searchJumpMode: boolean,
tutorialSkip: boolean,
@@ -169,7 +169,7 @@ export function getDefaultUiOpts(lytOpts: LayoutOptions): UiOptions {
touchDevice: onTouchDevice(),
breakpoint: getBreakpoint(),
// Other
- useReducedTree: false,
+ tree: 'images',
searchSuggLimit: 10,
searchJumpMode: false,
tutorialSkip: false,