From 53db7fe215e74d2ca47438133ba80a2fdc6bb954 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 20 Feb 2020 02:07:41 +0900 Subject: [PATCH] fix possible async issue --- src/scripts/settings/webSettings.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/scripts/settings/webSettings.js b/src/scripts/settings/webSettings.js index e059aa08a0..de0dff94ab 100644 --- a/src/scripts/settings/webSettings.js +++ b/src/scripts/settings/webSettings.js @@ -1,16 +1,26 @@ define(['appStorage', 'events'], function (appStorage, events) { 'use strict'; - var data = {}; + var data; + + function getConfig() { + if (data) { + return data; + } - function WebSettings() { fetch("/config.json").then(function (response) { data = response.json(); }) + + return data; + } + + function WebSettings() { + getConfig(); } WebSettings.prototype.enableMultiServer = function () { - return data.multiServer || false; + return getConfig().multiServer || false; }; return new WebSettings();