X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=f401c6ef28ea1e8db393516285b6d28dc24be6a8;hb=1112f1fdd39a4599cebc4b0b03bee1d28f1236ee;hp=47a86975c135b3c0587472472e3af9980c99f8cb;hpb=934f7f70431e9892b3ea48ba199356b4f24eaf1b;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 47a86975..f401c6ef 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -73,10 +73,14 @@ main
           )
         fieldset(v-if="st.user.id > 0")
           label(for="selectPlayers") {{ st.tr["Play with"] }}
-          select#selectPlayersInList(v-model="newchallenge.to")
+          select#selectPlayersInList(
+            v-model="newchallenge.to"
+            @change="changeChallTarget()"
+          )
             option(value="")
             option(
               v-for="p in Object.values(people)"
+              v-if="!!p.name"
               :value="p.name"
             )
               | {{ p.name }}
@@ -123,7 +127,7 @@ main
           p.anonymous @nonymous ({{ anonymousCount() }})
         #chat
           Chat(
-            :newChat="newChat"
+            ref="chatcomp"
             @mychat="processChat"
             :pastChats="[]"
           )
@@ -131,7 +135,7 @@ main
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
       .button-group
-        button#peopleBtn(onClick="window.doClick('modalPeople')")
+        button#peopleBtn(@click="openModalPeople()")
           | {{ st.tr["Who's there?"] }}
         button(@click="showNewchallengeForm()")
           | {{ st.tr["New game"] }}
@@ -193,7 +197,7 @@ main
           )
           button#loadMoreBtn(
             v-if="hasMore"
-            @click="loadMore()"
+            @click="loadMoreCorr()"
           )
             | {{ st.tr["Load more"] }}
 </template>
@@ -247,7 +251,6 @@ export default {
       tchallDiag: "",
       curChallToAccept: {from: {}},
       presetChalls: JSON.parse(localStorage.getItem("presetChalls") || "[]"),
-      newChat: "",
       conn: null,
       connexionString: "",
       // Related to (killing of) self multi-connects:
@@ -264,9 +267,14 @@ export default {
       });
       if (!this.newchallenge.V && this.newchallenge.vid > 0)
         this.loadNewchallVariant();
+    },
+    $route: function(to, from) {
+      if (to.path != "/") this.cleanBeforeDestroy();
     }
   },
   created: function() {
+    document.addEventListener('visibilitychange', this.visibilityChange);
+    window.addEventListener("beforeunload", this.cleanBeforeDestroy);
     if (this.st.variants.length > 0 && this.newchallenge.vid > 0)
       this.loadNewchallVariant();
     const my = this.st.user;
@@ -297,11 +305,10 @@ export default {
       encodeURIComponent(this.$route.path);
     this.conn = new WebSocket(this.connexionString);
     this.conn.onopen = connectAndPoll;
-    this.conn.onmessage = this.socketMessageListener;
-    this.conn.onclose = this.socketCloseListener;
+    this.conn.addEventListener("message", this.socketMessageListener);
+    this.conn.addEventListener("close", this.socketCloseListener);
   },
   mounted: function() {
-    document.addEventListener('visibilitychange', this.visibilityChange);
     ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => {
       document.getElementById(eltName)
         .addEventListener("click", processModalClick);
@@ -319,41 +326,9 @@ export default {
     this.setDisplay('c', showCtype);
     this.setDisplay('g', showGtype);
     // Ask server for current corr games (all but mines)
-    ajax(
-      "/observedgames",
-      "GET",
-      {
-        data: {
-          uid: this.st.user.id,
-          cursor: this.cursor
-        },
-        success: (response) => {
-          const L = response.games.length;
-          if (L > 0) {
-            this.cursor = response.games[L - 1].created;
-            if (this.games.length == 0 && this.gdisplay == "live") {
-              document
-                .getElementById("btnGcorr")
-                .classList.add("somethingnew");
-            }
-          }
-          this.games = this.games.concat(
-            response.games.map(g => {
-              const vname = this.getVname(g.vid);
-              return Object.assign(
-                {},
-                g,
-                {
-                  type: "corr",
-                  vname: vname
-                }
-              );
-            })
-          );
-        }
-      }
-    );
+    this.loadMoreCorr();
     // Also ask for corr challenges (open + sent by/to me)
+    // List them all, because they are not supposed to be that many (TODO?)
     ajax(
       "/challenges",
       "GET",
@@ -417,15 +392,23 @@ export default {
     );
   },
   beforeDestroy: function() {
-    document.removeEventListener('visibilitychange', this.visibilityChange);
-    this.send("disconnect");
+    this.cleanBeforeDestroy();
   },
   methods: {
+    cleanBeforeDestroy: function() {
+      document.removeEventListener('visibilitychange', this.visibilityChange);
+      window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
+      this.send("disconnect");
+    },
     getRandomnessClass: function(pc) {
       return {
         ["random-" + pc.randomness]: true
       };
     },
+    openModalPeople: function() {
+      window.doClick("modalPeople");
+      document.getElementById("inputChat").focus();
+    },
     anonymousCount: function() {
       let count = 0;
       Object.values(this.people).forEach(p => {
@@ -482,6 +465,13 @@ export default {
       if (!!this.curChallToAccept.fen) return { "margin-top": "10px" };
       return {};
     },
+    changeChallTarget: function() {
+      if (!this.newchallenge.to) {
+        // Reset potential FEN + diagram
+        this.newchallenge.fen = "";
+        this.newchallenge.diag = "";
+      }
+    },
     cadenceFocusIfOpened: function() {
       if (event.target.checked)
         document.getElementById("cadence").focus();
@@ -682,6 +672,8 @@ export default {
           break;
         case "killed":
           // I logged in elsewhere:
+          this.conn.removeEventListener("message", this.socketMessageListener);
+          this.conn.removeEventListener("close", this.socketCloseListener);
           this.conn = null;
           alert(this.st.tr["New connexion detected: tab now offline"]);
           break;
@@ -824,7 +816,7 @@ export default {
           break;
         }
         case "newchat":
-          this.newChat = data.data;
+          this.$refs["chatcomp"].newChat(data.data);
           if (!document.getElementById("modalPeople").checked)
             document.getElementById("peopleBtn").classList.add("somethingnew");
           break;
@@ -836,7 +828,7 @@ export default {
       this.conn.addEventListener("message", this.socketMessageListener);
       this.conn.addEventListener("close", this.socketCloseListener);
     },
-    loadMore: function() {
+    loadMoreCorr: function() {
       ajax(
         "/observedgames",
         "GET",
@@ -848,6 +840,16 @@ export default {
           success: (res) => {
             const L = res.games.length;
             if (L > 0) {
+              if (
+                this.cursor == Number.MAX_SAFE_INTEGER &&
+                this.games.length == 0 &&
+                this.gdisplay == "live"
+              ) {
+                // First loading: show indicators
+                document
+                  .getElementById("btnGcorr")
+                  .classList.add("somethingnew");
+              }
               this.cursor = res.games[L - 1].created;
               let moreGames = res.games.map(g => {
                 const vname = this.getVname(g.vid);
@@ -920,7 +922,7 @@ export default {
           position: parsedFen.position,
           orientation: parsedFen.turn
         });
-      }
+      } else this.newchallenge.diag = "";
     },
     newChallFromPreset(pchall) {
       this.partialResetNewchallenge();
@@ -1209,7 +1211,6 @@ export default {
           // Game state (including FEN): will be updated
           moves: [],
           clocks: [-1, -1], //-1 = unstarted
-          initime: [0, 0], //initialized later
           score: "*"
         }
       );