X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FAnalyse.vue;h=0a66ffc19d63341e6db7d47b28000ac624a93ca8;hb=a97bdbda4ecf83645d409b717e36828784d1450d;hp=035cd08954e7af4fe0808c24b34ace2d0c7d676c;hpb=604b951e4dc4647da9b251c5fff4ecb4c7b1b298;p=vchess.git

diff --git a/client/src/views/Analyse.vue b/client/src/views/Analyse.vue
index 035cd089..0a66ffc1 100644
--- a/client/src/views/Analyse.vue
+++ b/client/src/views/Analyse.vue
@@ -3,64 +3,72 @@ main
   .row
     .col-sm-12
       .text-center
-        input#fen(v-model="curFen" @input="adjustFenSize()")
-        button(@click="gotoFen()") {{ st.tr["Go"] }}
-  BaseGame(:game="game" :vr="vr")
+        input#fen(
+          v-model="curFen"
+          @input="adjustFenSize(); tryGotoFen()"
+        )
+  BaseGame(
+    :game="game"
+    @fenchange="setFen"
+  )
 </template>
 
 <script>
 import BaseGame from "@/components/BaseGame.vue";
 import { store } from "@/store";
-import { ArrayFun } from "@/utils/array";
 export default {
-  name: 'my-analyse',
+  name: "my-analyse",
   components: {
-    BaseGame,
+    BaseGame
   },
   // gameRef: to find the game in (potentially remote) storage
   data: function() {
     return {
       st: store.state,
-      gameRef: { //given in URL (rid = remote ID)
+      gameRef: {
+        //given in URL (rid = remote ID)
         vname: "",
         fen: ""
       },
       game: {
-        players:[{name:"Analyse"},{name:"Analyse"}],
-        mode: "analyze",
+        players: [{ name: "Analyse" }, { name: "Analyse" }],
+        mode: "analyze"
       },
-      vr: null, //"variant rules" object initialized from FEN
-      curFen: "",
-      //people: [], //players + observers //TODO later: interactive analyze...
+      curFen: ""
     };
   },
-  watch: {
-    // NOTE: no watcher for $route change, because if fenStart doesn't change
-    // then it doesn't trigger BaseGame.re_init() and the result is weird.
-    "vr.movesCount": function(fen) {
-      this.curFen = this.vr.getFen();
-      this.adjustFenSize();
-    },
-  },
+  // NOTE: no watcher for $route change, because if fenStart doesn't change
+  // then it doesn't trigger BaseGame.re_init() and the result is weird.
   created: function() {
     this.gameRef.vname = this.$route.params["vname"];
-    if (this.gameRef.vname == "Dark")
-    {
-      alert(this.st.tr["Analyse in Dark mode makes no sense!"]);
-      history.back(); //or this.$router.go(-1)
-    }
-    else
-    {
-      this.gameRef.fen = this.$route.query["fen"].replace(/_/g, " ");
+    const routeFen = this.$route.query["fen"];
+    if (!routeFen) this.alertAndQuit("Missing FEN");
+    else {
+      this.gameRef.fen = routeFen.replace(/_/g, " ");
       this.initialize();
     }
   },
   methods: {
+    alertAndQuit: function(text, wrongVname) {
+      // Soon after component creation, st.tr might be uninitialized.
+      // Set a timeout to let a chance for the message to show translated.
+      const newUrl = "/variants" + (wrongVname ? "" : "/" + this.gameRef.vname);
+      setTimeout(() => {
+        alert(this.st.tr[text] || text);
+        this.$router.replace(newUrl);
+      }, 500);
+    },
     initialize: async function() {
       // Obtain VariantRules object
-      const vModule = await import("@/variants/" + this.gameRef.vname + ".js");
-      window.V = vModule.VariantRules;
-      this.loadGame();
+      await import("@/variants/" + this.gameRef.vname + ".js")
+      .then((vModule) => {
+        window.V = vModule.VariantRules;
+        if (!V.CanAnalyze)
+          // Late check, in case the user tried to enter URL by hand
+          this.alertAndQuit("Analysis disabled for this variant");
+        else this.loadGame();
+      })
+      .catch((err) => { this.alertAndQuit("Mispelled variant name", true); });
     },
     loadGame: function() {
       // NOTE: no need to set score (~unused)
@@ -68,18 +76,25 @@ export default {
       this.game.fen = this.gameRef.fen;
       this.curFen = this.game.fen;
       this.adjustFenSize();
-      this.vr = new V(this.game.fen);
-      this.game.mycolor = this.vr.turn;
+      this.game.mycolor = V.ParseFen(this.gameRef.fen).turn;
       this.$set(this.game, "fenStart", this.gameRef.fen);
     },
+    // Triggered by "fenchange" emitted in BaseGame:
+    setFen: function(fen) {
+      this.curFen = fen;
+      this.adjustFenSize();
+    },
     adjustFenSize: function() {
       let fenInput = document.getElementById("fen");
       fenInput.style.width = this.curFen.length + "ch";
     },
-    gotoFen: function() {
-      this.gameRef.fen = this.curFen;
-      this.loadGame();
-    },
-  },
+    tryGotoFen: function() {
+      if (V.IsGoodFen(this.curFen))
+      {
+        this.gameRef.fen = this.curFen;
+        this.loadGame();
+      }
+    }
+  }
 };
 </script>