X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=6489b9373abadd2b1c6fb77e745d1537f6b2f7b4;hb=4313762da3237b04f204e121a20cab3ba7bb5dd2;hp=c98657ef50f2d4df1316a4b37540f79b8dd8350b;hpb=aae89b49a846b2c101d74db7dff9151392d6db34;p=vchess.git

diff --git a/client/src/store.js b/client/src/store.js
index c98657ef..6489b937 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
       }
     )
@@ -67,24 +79,21 @@ export const store = {
       this.state.user.notify = json.notify;
     });
     // Settings initialized with values from localStorage
-    const getItemDefaultTrue = (item) => {
+    const getItemDefault = (item, defaut) => {
       const value = localStorage.getItem(item);
-      if (!value) return true;
+      if (!value) return defaut;
       return value == "true";
     };
     this.state.settings = {
       bcolor: localStorage.getItem("bcolor") || "lichess",
-      sound: getItemDefaultTrue("sound"),
-      hints: getItemDefaultTrue("hints"),
-      highlight: getItemDefaultTrue("highlight"),
-      gotonext: getItemDefaultTrue("gotonext"),
-      randomness: parseInt(localStorage.getItem("randomness"))
+      sound: getItemDefault("sound", true),
+      hints: getItemDefault("hints", true),
+      highlight: getItemDefault("highlight", true),
+      gotonext: getItemDefault("gotonext", true),
+      scrollmove: getItemDefault("scrollmove", false)
     };
-    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");