butter/keanu-weblite
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch '409-if-no-matrix-domain-is-specified-in-configuration-use-the-same-domain' into 'dev'

Browse source 
Fix default server fallback

See merge request keanuapp/keanuapp-weblite!141
This commit is contained in:
N Pex 2023-02-20 15:54:37 +00:00
commit c82c02b39b
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main.js
View file

@ -26,7 +26,8 @@ Vue.config.productionTip = false
Vue.use(VueResize);
Vue.use(VEmojiPicker);
Vue.use(matrix, { store: store, i18n: i18n });
Vue.use(config); // Use this before cleaninsights below, it depends on config!
// eslint-disable-next-line
Vue.use(config, globalThis.window.location.origin); // Use this before cleaninsights below, it depends on config!
Vue.use(analytics);
Vue.use(VueClipboard);

4
src/services/config.service.js
View file

@ -1,5 +1,5 @@
export default {
install(Vue) {
install(Vue, defaultServerFromLocation) {
var config = Vue.observable(require('@/assets/config.json'));
const getRuntimeConfig = async () => {
const runtimeConfig = await fetch('./config.json');
@ -14,7 +14,7 @@ export default {
}
// If default server is not set, default to current server address
if (!json.defaultServer) {
Vue.set(config, "defaultServer", window.location.origin);
Vue.set(config, "defaultServer", defaultServerFromLocation);
}
});
Vue.prototype.$config = config;