Experimental change: options replacing randomness (more general)

[vchess.git] / client / src / store.js

diff --git a/client/src/store.js b/client/src/store.js
index 10ad10e..13c600b 100644 (file)
--- 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
       }
     )
@@ -76,10 +88,11 @@ export const store = {
       bcolor: localStorage.getItem("bcolor") || "lichess",
       sound: getItemDefaultTrue("sound"),
       hints: getItemDefaultTrue("hints"),
-      highlight: getItemDefaultTrue("highlight")
+      highlight: getItemDefaultTrue("highlight"),
+      gotonext: getItemDefaultTrue("gotonext"),
     };
     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");