X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=45535f84ea7d341659a3b9625ae00bba3640457e;hb=e50a802531b99829c533f22ecd21e359e7e1e049;hp=705f473c0fec795ca949445e42f540dccb285db5;hpb=f35b9960e1c527fc400ebac85321bd4712459da3;p=vchess.git diff --git a/client/src/store.js b/client/src/store.js index 705f473c..45535f84 100644 --- a/client/src/store.js +++ b/client/src/store.js @@ -1,8 +1,9 @@ -// NOTE: do not use ajax() here because ajax.js require the store for translations +// NOTE: do not use ajax() here because ajax.js requires the store import params from "./parameters"; //for server URL import { getRandString } from "./utils/alea"; -// Global store: see https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87 +// Global store: see +// https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87 export const store = { state: { variants: [], @@ -11,16 +12,26 @@ export const store = { settings: {}, lang: "" }, - socketCloseListener: null, initialize() { + const headers = { + "Content-Type": "application/json;charset=UTF-8", + "X-Requested-With": "XMLHttpRequest" + }; fetch( params.serverUrl + "/variants", - {method: "GET"}, + { + method: "GET", + headers: headers + } ) .then(res => res.json()) .then(json => { - this.state.variants = json.variantArray.sort( - (v1,v2) => v1.name.localeCompare(v2.name)); + if (!Array.isArray(json.variantArray)) { + alert("Variants loading failed: reload the page"); + return; + } + this.state.variants = json.variantArray + .sort((v1,v2) => v1.name.localeCompare(v2.name)); }); let mysid = localStorage.getItem("mysid"); // Assign mysid only once (until next time user clear browser data) @@ -42,6 +53,7 @@ export const store = { params.serverUrl + "/whoami", { method: "GET", + headers: headers, credentials: params.credentials } ) @@ -77,13 +89,14 @@ export const store = { sound: getItemDefaultTrue("sound"), hints: getItemDefaultTrue("hints"), highlight: getItemDefaultTrue("highlight"), - randomness: parseInt(localStorage.getItem("randomness")) + gotonext: getItemDefaultTrue("gotonext"), + randomness: parseInt(localStorage.getItem("randomness"), 10) }; if (isNaN(this.state.settings.randomness)) // Default: random asymmetric this.state.settings.randomness = 2; const supportedLangs = ["en", "es", "fr"]; - const navLanguage = navigator.language.substr(0,2); + const navLanguage = navigator.language.substr(0, 2); this.state.lang = localStorage["lang"] || (supportedLangs.includes(navLanguage) ? navLanguage : "en");