From 1161fc193f722d6564c4241b349a4c82e1fefd55 Mon Sep 17 00:00:00 2001 From: Justin Georgi Date: Sat, 30 Mar 2024 20:59:09 -0700 Subject: [PATCH] Disable conf.yaml for cordova builds Signed-off-by: Justin Georgi --- public/conf/conf.yaml | 2 +- src/components/app.vue | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/public/conf/conf.yaml b/public/conf/conf.yaml index 098cd86..bbd77bf 100644 --- a/public/conf/conf.yaml +++ b/public/conf/conf.yaml @@ -4,7 +4,7 @@ regions: - thorax - abdomen - limbs -#useExternal: required +useExternal: required external: - name: Mserver address: "192.169.1.105" diff --git a/src/components/app.vue b/src/components/app.vue index 1ae496e..b0b44f9 100644 --- a/src/components/app.vue +++ b/src/components/app.vue @@ -74,9 +74,11 @@ } }, async created () { - const confText = await fetch(`${!!window.cordova ? 'https://localhost' : '.'}/conf/conf.yaml`) - .then((mod) => { return mod.text() }) - this.siteConf = YAML.parse(confText) + if (!window.cordova) { + const confText = await fetch('./conf/conf.yaml') + .then((mod) => { return mod.text() }) + this.siteConf = YAML.parse(confText) + } const loadSiteSettings = localStorage.getItem('siteSettings') if (loadSiteSettings) { let loadedSettings = JSON.parse(loadSiteSettings)