Draft Hiddenqueen, Grasshopper and Knightmate chess (rules unwritten)

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

diff --git a/client/src/store.js b/client/src/store.js
index 373aa28..b81ec55 100644 (file)
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -13,12 +13,14 @@ export const store = {
   socketCloseListener: null,
   initialize() {
     ajax("/variants", "GET", res => {
-      this.state.variants = res.variantArray;
+      this.state.variants = res.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)
     if (!mysid) {
       mysid = getRandString();
-      localStorage.setItem("mysid", mysid); //done only once (unless user clear browser data)
+      localStorage.setItem("mysid", mysid);
     }
     // Quick user setup using local storage:
     this.state.user = {
@@ -34,33 +36,39 @@ export const store = {
       this.state.user.id = res.id;
       const storedId = localStorage.getItem("myid");
       if (res.id > 0 && !storedId)
-        //user cleared localStorage
+        // User cleared localStorage
         localStorage.setItem("myid", res.id);
       else if (res.id == 0 && !!storedId)
-        //user cleared cookie
+        // User cleared cookie
         localStorage.removeItem("myid");
       this.state.user.name = res.name;
       const storedName = localStorage.getItem("myname");
       if (!!res.name && !storedName)
-        //user cleared localStorage
+        // User cleared localStorage
         localStorage.setItem("myname", res.name);
       else if (!res.name && !!storedName)
-        //user cleared cookie
+        // User cleared cookie
         localStorage.removeItem("myname");
       this.state.user.email = res.email;
       this.state.user.notify = res.notify;
     });
     // Settings initialized with values from localStorage
+    const getItemDefaultTrue = (item) => {
+      const value = localStorage.getItem(item);
+      if (!value) return true;
+      return value == "true";
+    };
     this.state.settings = {
       bcolor: localStorage.getItem("bcolor") || "lichess",
-      sound: parseInt(localStorage.getItem("sound")) || 1,
-      hints: localStorage.getItem("hints") == "true",
-      highlight: localStorage.getItem("highlight") == "true"
+      sound: getItemDefaultTrue("sound"),
+      hints: getItemDefaultTrue("hints"),
+      highlight: getItemDefaultTrue("highlight")
     };
     const supportedLangs = ["en", "es", "fr"];
+    const navLanguage = navigator.language.substr(0,2);
     this.state.lang =
       localStorage["lang"] ||
-      (supportedLangs.includes(navigator.language) ? navigator.language : "en");
+      (supportedLangs.includes(navLanguage) ? navLanguage : "en");
     this.setTranslations();
   },
   updateSetting: function(propName, value) {