X-Git-Url: https://git.auder.net/js/rpsls.js?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FRules.vue;h=c069eb29b073451c2f195354dce7a75dd37a2281;hb=b2273c1bfd09e4ecf5e123cfa2eef2fa60838399;hp=c05e1843f0161f3b473be84425e351ee26d1d8b6;hpb=8055eabd23feaabe878b25522929c7273dcb0f24;p=vchess.git

diff --git a/client/src/views/Rules.vue b/client/src/views/Rules.vue
index c05e1843..c069eb29 100644
--- a/client/src/views/Rules.vue
+++ b/client/src/views/Rules.vue
@@ -26,6 +26,7 @@ main
           | {{ st.tr["Analysis mode"] }}
   .row
     .col-sm-12.col-md-8.col-md-offset-2.col-lg-6.col-lg-offset-3
+      h4#variantName(v-show="display=='rules'") {{ gameInfo.vname }}
       div(
         v-show="display=='rules'"
         v-html="content"
@@ -41,8 +42,9 @@ main
 <script>
 import ComputerGame from "@/components/ComputerGame.vue";
 import { store } from "@/store";
-import { getDiagram } from "@/utils/printDiagram";
+import { replaceByDiag } from "@/utils/printDiagram";
 import { CompgameStorage } from "@/utils/compgameStorage";
+import afterRawLoad from "@/utils/afterRawLoad";
 export default {
   name: "my-rules",
   components: {
@@ -72,23 +74,17 @@ export default {
   },
   computed: {
     showAnalyzeBtn: function() {
-      return this.V && this.V.CanAnalyze;
+      return !!this.V && this.V.CanAnalyze;
     },
     content: function() {
       if (!this.gameInfo.vname) return ""; //variant not set yet
-      // (AJAX) Request to get rules content (plain text, HTML)
       return (
-        require("raw-loader!@/translations/rules/" +
-          this.gameInfo.vname +
-          "/" +
-          this.st.lang +
-          ".pug")
-          // Next two lines fix a weird issue after last update (2019-11)
-          .replace(/\\n/g, " ")
-          .replace(/\\"/g, '"')
-          .replace('module.exports = "', "")
-          .replace(/"$/, "")
-          .replace(/(fen:)([^:]*):/g, this.replaceByDiag)
+        afterRawLoad(
+          require(
+            "raw-loader!@/translations/rules/" +
+            this.gameInfo.vname + "/" + this.st.lang + ".pug"
+          ).default
+        ).replace(/(fen:)([^:]*):/g, replaceByDiag)
       );
     }
   },
@@ -97,24 +93,25 @@ export default {
       if (this.display != "rules") this.display = "rules";
       else if (this.gameInProgress) this.display = "computer";
     },
-    parseFen(fen) {
-      const fenParts = fen.split(" ");
-      return {
-        position: fenParts[0],
-        marks: fenParts[1],
-        orientation: fenParts[2],
-        shadow: fenParts[3]
-      };
-    },
-    // Method to replace diagrams in loaded HTML
-    replaceByDiag: function(match, p1, p2) {
-      const args = this.parseFen(p2);
-      return getDiagram(args);
-    },
     re_setVariant: async function(vname) {
-      const vModule = await import("@/variants/" + vname + ".js");
-      this.V = window.V = vModule.VariantRules;
-      this.gameInfo.vname = vname;
+      const key = "rr_" + vname;
+      if (!localStorage.getItem(key))
+        // Mark rules as "read"
+        localStorage.setItem(key, '1');
+      await import("@/variants/" + vname + ".js")
+      .then((vModule) => {
+        this.V = window.V = vModule[vname + "Rules"];
+        this.gameInfo.vname = vname;
+      })
+      .catch((err) => {
+        // Soon after component creation, st.tr might be uninitialized.
+        // Set a timeout to let a chance for the message to show translated.
+        const text = "Mispelled variant name";
+        setTimeout(() => {
+          alert(this.st.tr[text] || text);
+          this.$router.replace("/variants");
+        }, 500);
+      });
     },
     startGame: function(mode) {
       if (this.gameInProgress) return;
@@ -123,14 +120,18 @@ export default {
       this.gameInfo.mode = mode;
       if (this.gameInfo.mode == "versus") {
         CompgameStorage.get(this.gameInfo.vname, (game) => {
-          // NOTE: game might be null
+          // NOTE: game might be null (if none stored yet)
+          if (!!game && !V.IsGoodFen(game.fen)) {
+            // Some issues with stored game: delete
+            CompgameStorage.remove(game.vname);
+            game = null;
+          }
           this.$refs["compgame"].launchGame(game);
         });
-      } else {
-        this.$refs["compgame"].launchGame();
       }
+      else this.$refs["compgame"].launchGame();
     },
-    // user wants to stop the game:
+    // The user wants to stop the game:
     stopGame: function() {
       this.$refs["compgame"].gameOver("?", "Undetermined result");
     },
@@ -142,83 +143,22 @@ export default {
     },
     gotoAnalyze: function() {
       this.$router.push(
-        "/analyse/" + this.gameInfo.vname + "/?fen=" + V.GenRandInitFen()
+        "/analyse/" + this.gameInfo.vname +
+        "/?fen=" + V.GenRandInitFen(this.st.settings.randomness)
       );
     }
   }
 };
 </script>
 
-<!-- NOTE: not scoped here, because HTML is injected (TODO) -->
+<!-- NOTE: not scoped here, because HTML is injected -->
 <style lang="sass">
-.warn
-  padding: 3px
-  color: red
-  background-color: lightgrey
-  font-weight: bold
+@import "@/styles/_board_squares_img.sass"
+@import "@/styles/_rules.sass"
+</style>
 
-figure.diagram-container
-  margin: 15px 0 15px 0
+<style lang="sass" scoped>
+h4#variantName
   text-align: center
-  width: 100%
-  display: block
-  .diagram
-    display: block
-    width: 40%
-    min-width: 240px
-    margin-left: auto
-    margin-right: auto
-  .diag12
-    float: left
-    margin-left: calc(10% - 20px)
-    margin-right: 40px
-    @media screen and (max-width: 630px)
-      float: none
-      margin: 0 auto 10px auto
-  .diag22
-    float: left
-    margin-right: calc(10% - 20px)
-    @media screen and (max-width: 630px)
-      float: none
-      margin: 0 auto
-  figcaption
-    display: block
-    clear: both
-    padding-top: 5px
-    font-size: 0.8em
-
-p.boxed
-  background-color: #FFCC66
-  padding: 5px
-
-.bigfont
-  font-size: 1.2em
-
-.bold
   font-weight: bold
-
-.stageDelimiter
-  color: purple
-
-// To show (new) pieces, and/or there values...
-figure.showPieces > img
-  width: 50px
-
-figure.showPieces > figcaption
-  color: #6C6C6C
-
-.section-title
-  padding: 0
-
-.section-title > h4
-  padding: 5px
-
-ol, ul:not(.browser-default)
-  padding-left: 20px
-
-ul:not(.browser-default)
-  margin-top: 5px
-
-ul:not(.browser-default) > li
-  list-style-type: disc
 </style>