From 7e05a04cd44a5ec3f247e2079af972c48148addc Mon Sep 17 00:00:00 2001 From: Taka Date: Sun, 13 Dec 2020 00:19:37 +1100 Subject: [PATCH] Apply the default settings when running the desktop app. --- vasl_templates/webapp/static/user_settings.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vasl_templates/webapp/static/user_settings.js b/vasl_templates/webapp/static/user_settings.js index fe450c4..43c6b03 100644 --- a/vasl_templates/webapp/static/user_settings.js +++ b/vasl_templates/webapp/static/user_settings.js @@ -1,7 +1,8 @@ SCENARIO_IMAGES_SOURCE_THIS_PROGRAM = 1 ; SCENARIO_IMAGES_SOURCE_INTERNET = 2 ; -gUserSettings = Cookies.getJSON( "user-settings" ) || { "scenario-images-source": SCENARIO_IMAGES_SOURCE_INTERNET } ; +DEFAULT_USER_SETTINGS = { "scenario-images-source": SCENARIO_IMAGES_SOURCE_INTERNET } ; +gUserSettings = Cookies.getJSON( "user-settings" ) || DEFAULT_USER_SETTINGS ; USER_SETTINGS = { "vasl-username": { type: "text" }, @@ -180,5 +181,7 @@ function apply_user_settings() function install_user_settings( user_settings ) // nb: this is called by the PyQT desktop application { gUserSettings = JSON.parse( user_settings ) ; + if ( Object.keys( gUserSettings ).length === 0 ) + gUserSettings = DEFAULT_USER_SETTINGS ; apply_user_settings() ; }