X-Git-Url: https://git.auder.net/js/rpsls.js?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FAnalyse.vue;h=baf1036441af17a7b4c3e8a5e8fcadc5a9621379;hb=f3fe29d815458e9bfca2295d16b1f6221040eb10;hp=23515c67cb1da03b6d187e4da43918963621bf7c;hpb=725da57f8e2983d744629b524f9084516a43cbac;p=vchess.git

diff --git a/client/src/views/Analyse.vue b/client/src/views/Analyse.vue
index 23515c67..baf10364 100644
--- a/client/src/views/Analyse.vue
+++ b/client/src/views/Analyse.vue
@@ -9,7 +9,7 @@ main
         )
   BaseGame(
     :game="game"
-    :vr="vr"
+    @fenchange="setFen"
   )
 </template>
 
@@ -34,40 +34,58 @@ export default {
         players: [{ name: "Analyse" }, { name: "Analyse" }],
         mode: "analyze"
       },
-      vr: null, //"variant rules" object initialized from FEN
       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() {
-      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"];
-    this.gameRef.fen = this.$route.query["fen"].replace(/_/g, " ");
-    this.initialize();
+    const routeFen = this.$route.query["fen"];
+    if (!routeFen) this.alertAndQuit("Missing FEN");
+    else {
+      this.gameRef.fen = routeFen.replace(/_/g, " ");
+      // orientation is optional: taken from FEN if missing
+      const orientation = this.$route.query["side"];
+      this.initialize(orientation);
+    }
   },
   methods: {
-    initialize: async function() {
+    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(orientation) {
       // 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(orientation);
+      })
+      .catch((err) => { this.alertAndQuit("Mispelled variant name", true); });
     },
-    loadGame: function() {
+    loadGame: function(orientation) {
       // NOTE: no need to set score (~unused)
       this.game.vname = this.gameRef.vname;
       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 = orientation || 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";